- gerrit-log - lists.osmocom.org

[XS] Change in osmo-hnbgw[master]: fix recently introduced indenting blunder

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email ) Change subject: fix recently introduced indenting blunder ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 Gerrit-Change-Number: 40163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Apr 2025 17:04:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email ) Change subject: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7 Gerrit-Change-Number: 40156 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Apr 2025 17:03:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in doc...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email ) Change subject: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in documentation ...................................................................... cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in documentation Change-Id: I6dcda9221aa77809fe0f10e0e159558aad07885c --- M src/sccp_user.c 1 file changed, 22 insertions(+), 4 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/sccp_user.c b/src/sccp_user.c index b869dab..62ae9ed 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -92,9 +92,14 @@ /*! \brief Bind a SCCP User to a given Point Code * \param[in] inst SCCP Instance * \param[in] name human-readable name + * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack * \param[in] ssn Sub-System Number to bind to * \param[in] pc Point Code to bind to, or OSMO_SS7_PC_INVALID if none. - * \returns Callee-allocated SCCP User on success; negative otherwise */ + * \returns Callee-allocated SCCP User on success; negative otherwise + * + * Ownership of oph->msg in prim_cb is transferred to the user of the + * registered callback when called. + */ static struct osmo_sccp_user * sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc) @@ -127,9 +132,14 @@ /*! \brief Bind a given SCCP User to a given SSN+PC * \param[in] inst SCCP Instance * \param[in] name human-readable name + * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack * \param[in] ssn Sub-System Number to bind to * \param[in] pc Point Code to bind to - * \returns Callee-allocated SCCP User on success; negative otherwise */ + * \returns Callee-allocated SCCP User on success; negative otherwise + * + * Ownership of oph->msg in prim_cb is transferred to the user of the + * registered callback when called. + */ struct osmo_sccp_user * osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc) @@ -140,8 +150,13 @@ /*! \brief Bind a given SCCP User to a given SSN (at any PC) * \param[in] inst SCCP Instance * \param[in] name human-readable name + * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack * \param[in] ssn Sub-System Number to bind to - * \returns Callee-allocated SCCP User on success; negative otherwise */ + * \returns Callee-allocated SCCP User on success; negative otherwise + * + * Ownership of oph->msg in prim_cb is transferred to the user of the + * registered callback when called. + */ struct osmo_sccp_user * osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name, osmo_prim_cb prim_cb, uint16_t ssn) @@ -175,7 +190,10 @@ /*! \brief Send a SCCP User SAP Primitive up to the User * \param[in] scu SCCP User to whom to send the primitive * \param[in] prim Primitive to send to the user - * \returns return value of the SCCP User's prim_cb() function */ + * \returns return value of the SCCP User's prim_cb() function + * + * Ownership of prim->oph->msg is passed to the user of the registered callback + */ int sccp_user_prim_up(struct osmo_sccp_user *scu, struct osmo_scu_prim *prim) { LOGP(DLSCCP, LOGL_DEBUG, "Delivering %s to SCCP User '%s'\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6dcda9221aa77809fe0f10e0e159558aad07885c Gerrit-Change-Number: 40157 Gerrit-PatchSet: 1 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>

2 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in doc...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email ) Change subject: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6dcda9221aa77809fe0f10e0e159558aad07885c Gerrit-Change-Number: 40157 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Apr 2025 17:03:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in ...pyosmocom[master]: bump version number to 0.0.9 for construct.{Bytes,GreedyBytes}

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/40118?usp=email ) Change subject: bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} ...................................................................... bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} Change-Id: Id8f9e617482c487f3314118ba3df9c937d501596 --- M debian/changelog M pyproject.toml 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 4bff797..fd85da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pyosmocom (0.0.9) unstable; urgency=medium + + [ Neels Hofmeyr ] + * .gitignore: add vim swap file pattern + + [ Harald Welte ] + * osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion + * bump version number to 0.0.9 for construct.{Bytes,GreedyBytes} + + -- Harald Welte <lafore(a)gnumonks.org> Wed, 23 Apr 2025 13:24:35 +0200 + pyosmocom (0.0.8) unstable; urgency=medium * construct: add length steps to StripTrailerAdapter diff --git a/pyproject.toml b/pyproject.toml index 37b54ed..5f8fb39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [project] name = "pyosmocom" -version = "0.0.8" +version = "0.0.9" dependencies = [ "gsm0338", "construct >= 2.9.51" -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/40118?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: Id8f9e617482c487f3314118ba3df9c937d501596 Gerrit-Change-Number: 40118 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conve...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email ) Change subject: osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion ...................................................................... osmocom.construct: Bytes + GreedyBytes with automatic hexstring-conversion This is a convenience version of the Bytes / GreedyBytes construct that accepts not only a bytes/bytearray object, but also a hex-encoded string within the encoder. Related: OS#6774 Change-Id: I59f500c925848872a7fa38d6dbf3d6ea72bc3a90 --- M src/osmocom/construct.py 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 7a2851a..5e062c3 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -10,9 +10,10 @@ # pylint: disable=import-error,no-name-in-module from construct.lib.containers import Container, ListContainer from construct.core import EnumIntegerString -from construct import Adapter, Prefixed, Int8ub, GreedyBytes, Default, Flag, Byte, Construct, Enum -from construct import BitsInteger, BitStruct, Bytes, StreamError, stream_read_entire, stream_write +from construct import Adapter, Prefixed, Int8ub, Default, Flag, Byte, Construct, Enum +from construct import BitsInteger, BitStruct, StreamError, stream_read_entire, stream_write from construct import SizeofError, IntegerError, swapbytes +import construct from construct.core import evaluate from construct.lib import integertypes @@ -33,6 +34,19 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +class Bytes(construct.Bytes): + """Just like construct.Bytes but supporting hex-string input.""" + def _build(self, obj, stream, context, path): + data = h2b(obj) if isinstance(obj, str) else obj + return super()._build(data, stream, context, path) + +(a)construct.core.singleton +class GreedyBytes(construct.GreedyBytes.__class__): + """Just like construct.GreedyBytes but supporting hex-string input.""" + def _build(self, obj, stream, context, path): + data = h2b(obj) if isinstance(obj, str) else obj + return super()._build(data, stream, context, path) + class HexAdapter(Adapter): """convert a bytes() type to a string of hex nibbles.""" -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/40117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I59f500c925848872a7fa38d6dbf3d6ea72bc3a90 Gerrit-Change-Number: 40117 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: rua: Handle event TX_DIRECT_TRANSFER in disconnected state discarding...

by neels

Attention is currently required from: lynxis lazus, pespin. neels has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40162?usp=email ) Change subject: rua: Handle event TX_DIRECT_TRANSFER in disconnected state discarding msg ...................................................................... Patch Set 1: (4 comments) Patchset: PS1: IMHO this patch should not modify the event handler function, but only add the event to the list of permitted events. The larger part of this patch seems like a workaround for a customer not providing a pcap... File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40162/comment/3b3c727c_fcfaf6e7?u… : PS1, Line 285: condition We have data to be sent out on RUA, but RUA is already disconnected. This can happen for any forsaken reason (RAN disconnected, CN disconnected, something went wrong on layer 2, ...) and we can't make any detailed statement here other than that. I believe this isn't called a race condition, is it https://gerrit.osmocom.org/c/osmo-hnbgw/+/40162/comment/f62ebfa0_021631e9?u… : PS1, Line 290: msgb_l2len(ranap_msg), osmo_hexdump(msgb_l2(ranap_msg), msgb_l2len(ranap_msg))); I think we should not print entire messages' hexdump on NOTICE. can we put the log message on DEBUG instead? It might make sense to log the dry fact on NOTICE, and additionally, separately the hexdump on DEBUG, and sanity-limit the hexdump length? https://gerrit.osmocom.org/c/osmo-hnbgw/+/40162/comment/ddeb620e_8eea5a36?u… : PS1, Line 295: all it's no longer all events -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id68f219ce776fbbfaa80d3b3ed976f48bef4f883 Gerrit-Change-Number: 40162 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sun, 27 Apr 2025 03:42:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 months, 1 week

1
0
0 0

[XS] Change in osmo-hnbgw[master]: fix recently introduced indenting blunder

by fixeria

Attention is currently required from: neels, pespin. fixeria has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email ) Change subject: fix recently introduced indenting blunder ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Whoever introduced this should fix/configure their code editor. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 Gerrit-Change-Number: 40163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 26 Apr 2025 13:29:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: fix recently introduced indenting blunder

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email ) Change subject: fix recently introduced indenting blunder ...................................................................... fix recently introduced indenting blunder Related: 0b4374bb9faf3f9c2a792c1c06117cc51784982d == I556e01b26a71b43432c623adb7ea5af2114981e3 Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 --- M include/osmocom/hnbgw/context_map.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/63/40163/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 41b312d..7e288d7 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -30,16 +30,16 @@ */ enum map_rua_fsm_event { /* Receiving a RUA Connect from HNB. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_RX_CONNECT, /* Receiving some data from HNB via RUA, to forward via SCCP to CN. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_RX_DIRECT_TRANSFER, /* Receiving a RUA Disconnect from HNB. - * Parameter: struct msgb *ranap_msg (can be NULL) */ + * Parameter: struct msgb *ranap_msg (can be NULL) */ MAP_RUA_EV_RX_DISCONNECT, /* SCCP has received some data from CN to forward via RUA to HNB. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_TX_DIRECT_TRANSFER, /* The CN side is disconnected (e.g. received an SCCP Released), that means we are going gracefully disconnect * RUA, too. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 Gerrit-Change-Number: 40163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in doc...

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email ) Change subject: cosmetic: osmo_sccp_user_bind() clarify prim_cb msgb ownership in documentation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6dcda9221aa77809fe0f10e0e159558aad07885c Gerrit-Change-Number: 40157 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Apr 2025 18:03:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log