pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39682?usp=email )
Change subject: Drop use of deprecated vty is_config_node() cb
......................................................................
Drop use of deprecated vty is_config_node() cb
This callback was drepecated and is not ever called since
libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0).
See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e.
Fixes: 4e934bb546e173ea525d778983cccce8f7c563c0
Change-Id: Idaad5148c7ca486b84bd67ad2ad90b96c3126316
---
M include/osmo-pcap/common.h
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/82/39682/1
diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h
index 7ac5bb0..5916c48 100644
--- a/include/osmo-pcap/common.h
+++ b/include/osmo-pcap/common.h
@@ -56,7 +56,6 @@
extern const struct log_info log_info;
extern const char *osmopcap_copyright;
extern int osmopcap_go_parent(struct vty *vty);
-extern int osmopcap_is_config_node(struct vty *vty, int node);
/* defined in libpcap's pcap-int.h, which is not public */
#ifndef MAXIMUM_SNAPLEN
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39682?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: Idaad5148c7ca486b84bd67ad2ad90b96c3126316
Gerrit-Change-Number: 39682
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39679?usp=email )
Change subject: Drop use of deprecated vty is_config_node() cb
......................................................................
Drop use of deprecated vty is_config_node() cb
This callback was drepecated and is not ever called since
libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0).
See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e.
Change-Id: Ib0d0079c76a18b09cde6ef3f22dda618ff5fbc98
---
M include/osmocom/sigtran/osmo_ss7.h
M src/osmo_ss7_vty.c
M stp/stp_main.c
3 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/79/39679/1
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 51c1cbd..66cbfe6 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -354,4 +354,6 @@
void osmo_ss7_vty_init_asp(void *ctx);
void osmo_ss7_vty_init_sg(void *ctx);
int osmo_ss7_vty_go_parent(struct vty *vty);
-int osmo_ss7_is_config_node(struct vty *vty, int node);
+int osmo_ss7_is_config_node(struct vty *vty, int node)
+ OSMO_DEPRECATED("Implicit parent node tracking has replaced the use of this callback. "
+ "This callback is no longer called, ever, and can be left NULL.");
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 8365db2..f76a69e 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -3042,6 +3042,8 @@
return 0;
}
+/* This is no longer used. The libosmocore callback was deprecated is not ever called since.
+ * libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). */
int osmo_ss7_is_config_node(struct vty *vty, int node)
{
switch (node) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index d630032..2d31ef0 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -73,7 +73,6 @@
.copyright = stp_copyright,
.version = PACKAGE_VERSION,
.go_parent_cb = osmo_ss7_vty_go_parent,
- .is_config_node = osmo_ss7_is_config_node,
};
static struct {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39679?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ib0d0079c76a18b09cde6ef3f22dda618ff5fbc98
Gerrit-Change-Number: 39679
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39677?usp=email )
Change subject: Drop use of deprecated vty is_config_node() cb
......................................................................
Drop use of deprecated vty is_config_node() cb
This callback was drepecated and is not ever called since
libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0).
See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e.
Change-Id: I391a6fc9f7325c1770ce410d31ed2d820726225a
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 0 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/39677/1
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 8da3199..77506c8 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -631,25 +631,6 @@
return vty->node;
}
-static int bsc_vty_is_config_node(struct vty *vty, int node)
-{
- /* Check if libosmo-sccp declares the node in
- * question as config node */
- if (osmo_ss7_is_config_node(vty, node))
- return 1;
-
- switch (node) {
- /* add items that are not config */
- case OML_NODE:
- case OM2K_NODE:
- case CONFIG_NODE:
- return 0;
-
- default:
- return 1;
- }
-}
-
static struct vty_app_info vty_info = {
.name = "OsmoBSC",
.copyright =
@@ -663,7 +644,6 @@
"There is NO WARRANTY, to the extent permitted by law.\r\n",
.version = PACKAGE_VERSION,
.go_parent_cb = bsc_vty_go_parent,
- .is_config_node = bsc_vty_is_config_node,
.usr_attr_desc = {
[BSC_VTY_ATTR_RESTART_ABIS_OML_LINK] = \
"This command applies on A-bis OML link (re)establishment",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39677?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I391a6fc9f7325c1770ce410d31ed2d820726225a
Gerrit-Change-Number: 39677
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: daniel, laforge, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email )
Change subject: Add missing required vty go_parent_cb for libosmo-sigtran
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
This one alone can fix the SMLC_Tests regressions that showed up today.
--
To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-smlc
Gerrit-Branch: master
Gerrit-Change-Id: Ibab25aa1a9ed4d0680fb61999e79b56b9a7d08dc
Gerrit-Change-Number: 39673
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 04 Mar 2025 16:50:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39667?usp=email )
Change subject: trau_frame cosmetic: fix doxygen comments
......................................................................
trau_frame cosmetic: fix doxygen comments
Change-Id: I5a69c25c4abeef0b62d92bedc2c56a2d533390c5
---
M src/trau/trau_frame.c
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index 74f4526..b8085c2 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -1231,10 +1231,10 @@
/*! Encode a TRAU frame from its decoded representation to a sequence of unpacked bits.
- * \param[out] bits caller-allocated buffer for unpacked outpud bits
+ * \param[out] bits caller-allocated buffer for unpacked output bits
* \param[in] n_bits size of 'bits' output buffer in number of unpacked bits
* \param[in] fr decoded representation of TRAU frame to be encoded
- * \return 0 number of unpacked output bits generated; negative in case of error
+ * \returns number of unpacked output bits generated; negative in case of error
*
* This function exhibits a behavioral quirk which users need to be aware of:
* for many frame types, the first 5 bits out of user-provided fr->c_bits[]
@@ -1326,10 +1326,10 @@
}
/*! Encode a TFO frame from its decoded representation to a sequence of unpacked bits.
- * \param[out] bits caller-allocated buffer for unpacked outpud bits
+ * \param[out] bits caller-allocated buffer for unpacked output bits
* \param[in] n_bits size of 'bits' output buffer in number of unpacked bits
* \param[in] fr decoded representation of TRAU frame to be encoded
- * \return 0 number of unpacked output bits generated; negative in case of error
+ * \returns number of unpacked output bits generated; negative in case of error
*
* Compared to regular osmo_trau_frame_encode(), this TFO-specific TRAU frame
* encoding function restricts the set of possible frame types to those that
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39667?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I5a69c25c4abeef0b62d92bedc2c56a2d533390c5
Gerrit-Change-Number: 39667
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39668?usp=email )
Change subject: trau_frame cosmetic: document exact behavior for C1..C5
......................................................................
trau_frame cosmetic: document exact behavior for C1..C5
For historical reasons, osmo_trau_frame_encode() API has quirky
behavior with regard to output of control bits C1..C5: for some
frame types these bits are set to user-controlled values taken
from fr->c_bits[], yet for other frame types the function fills
in what it "knows" to be the correct frame type code, ignoring
the first 5 bits out of user-supplied fr->c_bits[]. One particular
combination of frame type and direction is even more bizarre,
taking only fr->c_bits[3] while fixing the other 4 C-bits.
Unfortunately this behavior cannot be changed without breaking
API compatibility with previous released versions, i.e., without
breaking external applications that rely on this library behavior.
Therefore, we do the next best thing: thoroughly and succinctly
document these quirks.
Change-Id: Id1824c7cc8845ee2a730d556bec807c3cfa75beb
---
M src/trau/trau_frame.c
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index b8085c2..652c703 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -1246,6 +1246,25 @@
* where C1..C5 may need to be modified (especially TFO-AMR where this C1..C5
* modification must be done before CRC computation), please use
* osmo_trau_frame_encode_tfo().
+ *
+ * The following list summarizes the behavior of the present function with
+ * regard to C1..C5 bits for different frame types:
+ *
+ * - For all TRAU-16k frame types in both UL and DL directions, and for
+ * OSMO_TRAU8_SPEECH (TRAU-8k for HRv1 speech) in UL direction, the first 5
+ * bits of fr->c_bits[] are ignored and replaced with internally supplied
+ * constant values.
+ *
+ * - For OSMO_TRAU8_SPEECH in DL direction, only fr->c_bits[3] is used to set
+ * C4; constant values for C1..C3 and odd parity value for C5 are fixed
+ * by the function.
+ *
+ * - For OSMO_TRAU8_DATA, OSMO_TRAU8_OAM and all AMR-8k frame types,
+ * user-supplied fr->c_bits[] are always used.
+ *
+ * This unfortunate manipulation applies only to C1..C5 as listed above;
+ * for control bits C6 and higher (for frame types that have them),
+ * user-supplied fr->c_bits[] are always used.
*/
int osmo_trau_frame_encode(ubit_t *bits, size_t n_bits, const struct osmo_trau_frame *fr)
{
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39668?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Id1824c7cc8845ee2a730d556bec807c3cfa75beb
Gerrit-Change-Number: 39668
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>