Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/29874 )
Change subject: Transceiver::expectedCorrType(): RACH is always 8-bit on PTCCH/U
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/29874
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I5fb9f1c6810cdcd26a885b183e414d01d422eb28
Gerrit-Change-Number: 29874
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 26 Oct 2022 08:06:37 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o…
Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_11/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-hlr
Last lines of build log:
[ 296s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xetex to provide /usr/bin/rst2xetex (rst2xetex) in auto mode
[ 296s] update-alternatives: using /usr/share/docutils/scripts/python3/rst2xml to provide /usr/bin/rst2xml (rst2xml) in auto mode
[ 296s] update-alternatives: using /usr/share/docutils/scripts/python3/rstpep2html to provide /usr/bin/rstpep2html (rstpep2html) in auto mode
[ 297s] [449/481] installing python3-reportlab-3.5.59-2
[ 300s] [450/481] installing g++-4:10.2.1-1+rpi1
[ 300s] update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode
[ 300s] [451/481] installing libosmo-netif-dev-1.2.0.61.a07c.202210260053
[ 301s] [452/481] installing mount-2.36.1-8+deb11u1
[ 301s] [453/481] installing texlive-latex-extra-2020.20210202-3
[ 315s] [454/481] installing debhelper-13.3.4
[ 318s] [455/481] installing bash-5.1-2+deb11u1
[ 320s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode
[ 320s] [456/481] installing build-essential-12.9
[ 320s] [457/481] installing python3-blockdiag-2.0.1+dfsg-1
[ 322s] [458/481] installing texlive-xetex-2020.20210202-3
[ 322s] dpkg-deb (subprocess): decompressing archive '.init_b_cache/texlive-xetex.deb' (size=12542520) member 'data.tar': lzma error: compressed data is corrupt
[ 322s] dpkg-deb: error: <decompress> subprocess returned error exit status 2
[ 322s] dpkg: error processing archive .init_b_cache/texlive-xetex.deb (--install):
[ 322s] cannot copy extracted data for './usr/share/doc/texlive-doc/xelatex/cqubeamer/cqubeamer.pdf' to '/usr/share/doc/texlive-doc/xelatex/cqubeamer/cqubeamer.pdf.dpkg-new': unexpected end of file or stream
[ 322s] Errors were encountered while processing:
[ 322s] .init_b_cache/texlive-xetex.deb
[ 322s] exit ...
[ 322s] ### VM INTERACTION START ###
[ 324s] [ 289.790807] sysrq: SysRq : Power Off
[ 324s] [ 289.792261] reboot: Power down
[ 324s] ### VM INTERACTION END ###
[ 324s]
[ 324s] armbuild02 failed "build osmo-hlr_1.5.0.8.53f60.202210260053.dsc" at Wed Oct 26 02:34:59 UTC 2022.
[ 324s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/29874 )
Change subject: Transceiver::expectedCorrType(): RACH is always 8-bit on PTCCH/U
......................................................................
Transceiver::expectedCorrType(): RACH is always 8-bit on PTCCH/U
It does not make sense for the MS to use 11-bit Access Bursts on
PTCCH/U because the payload does not matter, only the ToA does.
Change-Id: I5fb9f1c6810cdcd26a885b183e414d01d422eb28
---
M Transceiver52M/Transceiver.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/74/29874/1
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 42aa93e..cbe1e27 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -584,7 +584,7 @@
case XIII: {
int mod52 = burstFN % 52;
if ((mod52 == 12) || (mod52 == 38))
- return cfg->ext_rach ? EXT_RACH : RACH;
+ return RACH; /* RACH is always 8-bit on PTCCH/U */
else if ((mod52 == 25) || (mod52 == 51))
return IDLE;
else /* Enable 8-PSK burst detection if EDGE is enabled */
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/29874
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I5fb9f1c6810cdcd26a885b183e414d01d422eb28
Gerrit-Change-Number: 29874
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29761 )
Change subject: msgb: introduce extended copy functions
......................................................................
msgb: introduce extended copy functions
Those are similar to existing *msgb_alloc*() functions but allows
to change the size of destination msgb provided it fits the
data from source msgb.
Change-Id: I36d4c16241d19f0f73c325be4d0e0bdef6813615
Signed-off-by: Max <msuraev(a)sysmocom.de>
---
M include/osmocom/core/msgb.h
M src/msgb.c
2 files changed, 46 insertions(+), 10 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/core/msgb.h b/include/osmocom/core/msgb.h
index 1e2b023..3fdb189 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -70,6 +70,8 @@
int old_size, int new_size);
extern struct msgb *msgb_copy(const struct msgb *msg, const char *name);
extern struct msgb *msgb_copy_c(const void *ctx, const struct msgb *msg, const char *name);
+extern struct msgb *msgb_copy_resize(const struct msgb *msg, uint16_t new_len, const char *name);
+extern struct msgb *msgb_copy_resize_c(const void *ctx, const struct msgb *msg, uint16_t new_len, const char *name);
static int msgb_test_invariant(const struct msgb *msg) __attribute__((pure));
/*! Free all msgbs from a queue built with msgb_enqueue().
diff --git a/src/msgb.c b/src/msgb.c
index 0881a55..713510c 100644
--- a/src/msgb.c
+++ b/src/msgb.c
@@ -314,31 +314,39 @@
return tall_msgb_ctx;
}
-/*! Copy an msgb.
+/*! Copy an msgb with memory reallocation.
*
- * This function allocates a new msgb, copies the data buffer of msg,
- * and adjusts the pointers (incl l1h-l4h) accordingly. The cb part
- * is not copied.
+ * This function allocates a new msgb with new_len size, copies the data buffer of msg,
+ * and adjusts the pointers (incl l1h-l4h) accordingly. The cb part is not copied.
+ * \param[in] ctx talloc context on which allocation happens
* \param[in] msg The old msgb object
- * \param[in] name Human-readable name to be associated with msgb
+ * \param[in] new_len The length of new msgb object
+ * \param[in] name Human-readable name to be associated with new msgb
*/
-struct msgb *msgb_copy_c(const void *ctx, const struct msgb *msg, const char *name)
+struct msgb *msgb_copy_resize_c(const void *ctx, const struct msgb *msg, uint16_t new_len, const char *name)
{
struct msgb *new_msg;
- new_msg = msgb_alloc_c(ctx, msg->data_len, name);
+ if (new_len < msgb_length(msg)) {
+ LOGP(DLGLOBAL, LOGL_ERROR,
+ "Data from old msgb (%u bytes) won't fit into new msgb (%u bytes) after reallocation\n",
+ msgb_length(msg), new_len);
+ return NULL;
+ }
+
+ new_msg = msgb_alloc_c(ctx, new_len, name);
if (!new_msg)
return NULL;
- /* copy data */
- memcpy(new_msg->_data, msg->_data, new_msg->data_len);
-
/* copy header */
new_msg->len = msg->len;
new_msg->data += msg->data - msg->_data;
new_msg->head += msg->head - msg->_data;
new_msg->tail += msg->tail - msg->_data;
+ /* copy data */
+ memcpy(new_msg->data, msg->data, msgb_length(msg));
+
if (msg->l1h)
new_msg->l1h = new_msg->_data + (msg->l1h - msg->_data);
if (msg->l2h)
@@ -351,6 +359,32 @@
return new_msg;
}
+/*! Copy an msgb with memory reallocation.
+ *
+ * This function allocates a new msgb with new_len size, copies the data buffer of msg,
+ * and adjusts the pointers (incl l1h-l4h) accordingly. The cb part is not copied.
+ * \param[in] msg The old msgb object
+ * \param[in] name Human-readable name to be associated with new msgb
+ */
+struct msgb *msgb_copy_resize(const struct msgb *msg, uint16_t new_len, const char *name)
+{
+ return msgb_copy_resize_c(tall_msgb_ctx, msg, new_len, name);
+}
+
+/*! Copy an msgb.
+ *
+ * This function allocates a new msgb, copies the data buffer of msg,
+ * and adjusts the pointers (incl l1h-l4h) accordingly. The cb part
+ * is not copied.
+ * \param[in] ctx talloc context on which allocation happens
+ * \param[in] msg The old msgb object
+ * \param[in] name Human-readable name to be associated with msgb
+ */
+struct msgb *msgb_copy_c(const void *ctx, const struct msgb *msg, const char *name)
+{
+ return msgb_copy_resize_c(ctx, msg, msg->data_len, name);
+}
+
/*! Copy an msgb.
*
* This function allocates a new msgb, copies the data buffer of msg,
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29761
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I36d4c16241d19f0f73c325be4d0e0bdef6813615
Gerrit-Change-Number: 29761
Gerrit-PatchSet: 5
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
Hello osmith, Jenkins Builder, laforge, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/29846
to look at the new patch set (#4).
Change subject: Rework tbf::update_ms()
......................................................................
Rework tbf::update_ms()
That function was pretty confusing since it used a "enum
gprs_rlcmac_tbf_direction dir" param (whose type is expected to describe
the data direction of a TBF) to describe the direction of the the packet
which triggered its call.
The parameter was actually always called with "GPRS_RLCMAC_UL_TBF" which
in this case meant "uplink direction" which meant "TLLI was updated from
the MS, not the SGSN".
The DL direction was only used in unit tests, which can hence be simply
replaced by ms_confirm_tlli(), which this commit does.
So this update_ms() function was actually used in practice in osmo-pcu
to trigger update of TLLI and find duplicates only when an RLCMAC block
(control or data) was received from the MS. Therefore, this function is
renamed in this patch and moved to the gprs_ms class, since it really
does nothing with the TBF.
Related: OS#5700
Change-Id: I1b7c0fde15b9bb8a973068994dbe972285ad0aff
---
M src/gprs_ms.c
M src/gprs_ms.h
M src/gprs_ms_storage.cpp
M src/gprs_ms_storage.h
M src/pdch.cpp
M src/tbf.cpp
M src/tbf.h
M src/tbf_ul.cpp
M tests/alloc/AllocTest.cpp
M tests/tbf/TbfTest.cpp
10 files changed, 63 insertions(+), 43 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/29846/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29846
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I1b7c0fde15b9bb8a973068994dbe972285ad0aff
Gerrit-Change-Number: 29846
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, fixeria.
Hello osmith, Jenkins Builder, laforge, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/29845
to look at the new patch set (#3).
Change subject: Avoid loosing DL tbf from old_ms when rx premier UL data
......................................................................
Avoid loosing DL tbf from old_ms when rx premier UL data
Scenario:
MS has UL TBF to attach to the network in FINISHED state, PCU received
DL data to continue with registration and creates a DL TBF in ASSIGN
state (through PCH).
At that point, the MS creates a new UL TBF through RACH request and PCU
creates it with a new MS object (because TLLI is not known at that
time).
When first UL data is received, due to contention resolution the PCU
learns the TLLI and finds out it already has another older MS object
with that TLLI, hence a duplicate and a merge must be done.
During that merge of the 2 MS objects, the DL TBF in ASSIGN state was
being freed. Let's actually not free it since we'll need to tell that DL
TBF in this scenario that it should instead re-start assignment through
PACCH.
Otherwise the MS keeps trying to register but the PCU is never able to
establish a DL TBF because it keeps assigning it through PCH instead of
PACCH.
Related: OS#5700
Change-Id: I9a989af89f9469d7894b9e70a2ea01989b9dbb75
---
M src/gprs_ms.c
M src/tbf.cpp
M src/tbf_dl.cpp
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
5 files changed, 44 insertions(+), 46 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/45/29845/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29845
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I9a989af89f9469d7894b9e70a2ea01989b9dbb75
Gerrit-Change-Number: 29845
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, neels.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837 )
Change subject: BSC: add TC_ho_meas_rep_multi_band
......................................................................
Patch Set 3:
(1 comment)
File library/BSSMAP_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837/comment/854f4d89_befa…
PS3, Line 898: cid_list := *
> Wouldn't this break existing code using this?
No, it would not. This template modifies 'tr_BSSAP_BSSMAP', which does set 'pdu.bssmap' (and thus all inner firelds) to '?'. PDU_BSSMAP_HandoverRequired.cellIdentifierList is always expected to be present. Before your change the implicit default value is '?'. Value '*' makes no sense because it can never be 'omit'. Adding '(present)' template restriction explicitly tells the caller that it's always present and cannot be 'omit'.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29837
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fe6bb9e4b5a69ea6204585ebdf1f157a68a8286
Gerrit-Change-Number: 29837
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 25 Oct 2022 16:31:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29859 )
Change subject: cosmetic: Clarify and fix typos in comment
......................................................................
cosmetic: Clarify and fix typos in comment
Change-Id: Ibcbe7d85cf7e1912de73d59540f2dea1dfa5d98d
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 29c0dc2..23e785d 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1530,9 +1530,9 @@
mgcp_conn_watchdog_kick(conn_src->conn);
- /* If AMR is configured for the ingress connection a conversion of the
- * framing mode (octet-aligned vs. bandwith-efficient is explicitly
- * define, then we check if the incoming payload matches that
+ /* If AMR is configured for the ingress connection and conversion of the
+ * framing mode (octet-aligned vs. bandwith-efficient) is explicitly
+ * defined, then we check if the incoming payload matches that
* expectation. */
if (mc->proto == MGCP_PROTO_RTP &&
amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29859
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ibcbe7d85cf7e1912de73d59540f2dea1dfa5d98d
Gerrit-Change-Number: 29859
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged