Attention is currently required from: msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 )
Change subject: BSSMAP: make sure we don't try to reset non-existent entity
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
Patchset:
PS1:
I think this is not the proper fix. The caller should avoid doing this in first place if that pointer is NULL.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48
Gerrit-Change-Number: 28892
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 02 Aug 2022 12:36:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28887 )
Change subject: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link
......................................................................
cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link
This way upper layers know right away that the message could not be
transmitted to that peer.
Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4
---
M src/cbsp_link.c
M src/sbcap_link.c
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: 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
fixeria: Looks good to me, but someone else must approve
diff --git a/src/cbsp_link.c b/src/cbsp_link.c
index 564df3f..2c31455 100644
--- a/src/cbsp_link.c
+++ b/src/cbsp_link.c
@@ -331,6 +331,11 @@
get_value_string(cbsp_msg_type_names, cbsp->msg_type));
talloc_free(cbsp);
return -ENOLINK;
+ } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) {
+ LOGPCC(link, LOGL_NOTICE, "Cannot transmit %s: reconnecting\n",
+ get_value_string(cbsp_msg_type_names, cbsp->msg_type));
+ talloc_free(cbsp);
+ return -ENOTCONN;
}
LOGPCC(link, LOGL_INFO, "Transmitting %s\n",
diff --git a/src/sbcap_link.c b/src/sbcap_link.c
index 3f5d792..f8d8a09 100644
--- a/src/sbcap_link.c
+++ b/src/sbcap_link.c
@@ -398,6 +398,11 @@
sbcap_pdu_get_name(pdu));
rc = -ENOLINK;
goto ret_free;
+ } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) {
+ LOGPSBCAPC(link, LOGL_NOTICE, "Cannot transmit msg %s: reconnecting\n",
+ sbcap_pdu_get_name(pdu));
+ rc = -ENOTCONN;
+ goto ret_free;
}
LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n",
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28887
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4
Gerrit-Change-Number: 28887
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
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: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 )
Change subject: BSSMAP: make sure we don't try to reset non-existent entity
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48
Gerrit-Change-Number: 28892
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Tue, 02 Aug 2022 12:17:55 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28886 )
Change subject: cbsp/sbcap: Set link fsm id with peer's name
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
File src/cbsp_link.c:
https://gerrit.osmocom.org/c/osmo-cbc/+/28886/comment/86b2e57b_dab761eb
PS1, Line 51: peer->name
> Good point, I need to sanitize the string beforehand, thanks.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28886
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb
Gerrit-Change-Number: 28886
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 02 Aug 2022 12:14:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: dexter.
wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28850 )
Change subject: Improved parsing in macpdu_decode_resource
......................................................................
Patch Set 2:
(1 comment)
File src/tetra_mac_pdu.c:
https://gerrit.osmocom.org/c/osmo-tetra/+/28850/comment/42cd7584_14f4031f
PS1, Line 245:
> stray tab, emacs?
laforge gave me some pointers on how to use the linter locally, hopefully I can prevent such issues in the future. Issue is amended
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3
Gerrit-Change-Number: 28850
Gerrit-PatchSet: 2
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 02 Aug 2022 11:27:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28596 )
Change subject: fixed out of bounds write to pdu_sync buffer
......................................................................
Patch Set 2:
(1 comment)
File src/conv_enc_test.c:
https://gerrit.osmocom.org/c/osmo-tetra/+/28596/comment/629541fa_5b932491
PS1, Line 338: *((uint32_t *)pdu_sync) = r;
> are we sure pdu_sync is always aligned and the type-cast is safe even on architectures that don't do […]
Although the pdu_sync buffer will almost certainly be at least dword-aligned, I took your recommendation and the code now uses osmo_store32le.
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28596
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I414bf2d61dc1cb37d30dc84b401a75b918116bbb
Gerrit-Change-Number: 28596
Gerrit-PatchSet: 2
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 02 Aug 2022 11:26:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: wbokslag.
Hello Jenkins Builder, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-tetra/+/28850
to look at the new patch set (#2).
Change subject: Improved parsing in macpdu_decode_resource
......................................................................
Improved parsing in macpdu_decode_resource
fill_bits and grant_position bits are now parsed and stored in the tetra_resrc_decoded struct
A flag is_encrypted is set to to true if resource was not encrypted or if the calling function
states that the frame has been decrypted successfully before passing it to tetra_resrc_decoded.
Lastly, the channel_alloc element is only parsed if the frame is unencrypted.
Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3
---
M src/tetra_mac_pdu.c
M src/tetra_mac_pdu.h
M src/tetra_upper_mac.c
3 files changed, 17 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/50/28850/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3
Gerrit-Change-Number: 28850
Gerrit-PatchSet: 2
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-MessageType: newpatchset