Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33686 )
Change subject: osmo_io: Add function to change the maximum length of the tx_queue
......................................................................
Patch Set 3: Code-Review+2
(1 comment)
Patchset:
PS3:
Re-adding +2 from before
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33686
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If3d1de8bffe1123002515878655ea9e02b482888
Gerrit-Change-Number: 33686
Gerrit-PatchSet: 3
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 10:36:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: daniel.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33716 )
Change subject: osmo_io(cosmetic): End in a dot for doxygen AUTO_BRIEF
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File src/core/osmo_io.c:
https://gerrit.osmocom.org/c/libosmocore/+/33716/comment/2ef9012c_e3192024
PS1, Line 90: * \param[in] iofd the osmo_io file structure
I wonder if the \param ... lines also need a dot. At least I always put a dot on those lines as well. (I am not a doxygen expert)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33716
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I397304eed524db12e60a6534d21ea268f304cfdc
Gerrit-Change-Number: 33716
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 10:09:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33666 )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: mncc_builtin: permit data bearer types
......................................................................
mncc_builtin: permit data bearer types
Related: OS#4394
Change-Id: I7bd6fa836e5a5c05c5d2358a9b8fd2b61981dd5f
---
M src/libmsc/mncc_builtin.c
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index a711e07..c1debc5 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -85,10 +85,14 @@
goto out_reject;
}
- /* we currently only do speech */
- if (setup->bearer_cap.transfer != GSM_MNCC_BCAP_SPEECH) {
+ /* we currently only do speech and CSD */
+ switch (setup->bearer_cap.transfer) {
+ case GSM_MNCC_BCAP_SPEECH:
+ case GSM_MNCC_BCAP_UNR_DIG:
+ break;
+ default:
LOGP(DMNCC, LOGL_NOTICE, "(call %x) We only support "
- "voice calls\n", call->callref);
+ "voice calls and CSD\n", call->callref);
mncc_set_cause(&mncc, GSM48_CAUSE_LOC_PRN_S_LU,
GSM48_CC_CAUSE_BEARER_CA_UNAVAIL);
goto out_reject;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33666
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I7bd6fa836e5a5c05c5d2358a9b8fd2b61981dd5f
Gerrit-Change-Number: 33666
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33716 )
Change subject: osmo_io(cosmetic): End in a dot for doxygen AUTO_BRIEF
......................................................................
osmo_io(cosmetic): End in a dot for doxygen AUTO_BRIEF
Change-Id: I397304eed524db12e60a6534d21ea268f304cfdc
---
M src/core/osmo_io.c
1 file changed, 33 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/33716/1
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 8cc6d37..b4c8eb6 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -86,7 +86,7 @@
osmo_iofd_init();
}
-/*! Allocate the msghdr
+/*! Allocate the msghdr.
* \param[in] iofd the osmo_io file structure
* \param[in] action the action this msg(hdr) is for (read, write, ..)
* \param[in] msg the msg buffer to use. Will allocate a new one if NULL
@@ -111,7 +111,7 @@
return hdr;
}
-/*! Free the msghdr
+/*! Free the msghdr.
* \param[in] msghdr the msghdr to free
*/
void iofd_msghdr_free(struct iofd_msghdr *msghdr)
@@ -155,7 +155,7 @@
return msg;
}
-/*! Enqueue a message to be sent
+/*! Enqueue a message to be sent.
*
* Enqueues the message at the back of the queue provided there is enough space.
* \param[in] iofd the file descriptor
@@ -177,7 +177,7 @@
return 0;
}
-/*! Enqueue a message at the front
+/*! Enqueue a message at the front.
*
* Used to enqueue a msgb from a partial send again. This function will always
* enqueue the message, even if the maximum number of messages is reached.
@@ -193,7 +193,7 @@
osmo_iofd_ops.write_enable(iofd);
}
-/*! Dequeue a message from the front
+/*! Dequeue a message from the front.
*
* \param[in] iofd the file descriptor
* \returns the msghdr from the front of the queue or NULL if the queue is empty
@@ -302,7 +302,7 @@
/* Public functions */
-/*! Send a message through a connected socket
+/*! Send a message through a connected socket.
*
* Appends the message to the internal transmit queue.
* If the function returns success (0) it will take ownership of the msgb and
@@ -335,7 +335,7 @@
return 0;
}
-/*! Send a message through an unconnected socket
+/*! Send a message through an unconnected socket.
*
* Appends the message to the internal transmit queue.
* If the function returns success (0), it will take ownership of the msgb and
@@ -378,7 +378,7 @@
return 0;
}
-/*! Allocate and setup a new iofd
+/*! Allocate and setup a new iofd.
* \param[in] ctx the parent context from which to allocate
* \param[in] fd the underlying system file descriptor
* \param[in] name the name of the iofd
@@ -418,7 +418,7 @@
return iofd;
}
-/*! Register the fd with the underlying backend
+/*! Register the fd with the underlying backend.
*
* \param[in] iofd the iofd file descriptor
* \param[in] fd the system fd number that will be registeres. If negative will use the one already set.
@@ -445,7 +445,7 @@
return rc;
}
-/*! Unregister the fd from the underlying backend
+/*! Unregister the fd from the underlying backend.
*
* \param[in] iofd the file descriptor
* \returns zero on success, a negative value on error
@@ -459,7 +459,7 @@
return 0;
}
-/*! Get the number of messages in the tx queue
+/*! Get the number of messages in the tx queue.
*
* \param[in] iofd the file descriptor
*/
@@ -468,7 +468,7 @@
return iofd->tx_queue.current_length;
}
-/*! Clear the transmit queue of the the iofd
+/*! Clear the transmit queue of the the iofd.
*
* This function frees all messages currently pending in the transmit queue
* \param[in] iofd the file descriptor
@@ -482,7 +482,7 @@
}
}
-/*! Free the iofd
+/*! Free the iofd.
*
* This function is safe to use in the read/write callbacks and will defer freeing it until safe to do so.
* The iofd will be closed before.
@@ -504,7 +504,7 @@
}
}
-/*! Close the iofd
+/*! Close the iofd.
*
* This function closes the underlying fd and clears any messages in the tx queue
* The iofd is not freed and can be assigned a new file descriptor with osmo_iofd_register()
@@ -532,7 +532,7 @@
return rc;
}
-/*! Set the size and headroom of the msgb allocated when receiving messages
+/*! Set the size and headroom of the msgb allocated when receiving messages.
* \param[in] iofd the file descriptor
* \param[in] size the size of the msgb when receiving data
* \param[in] headroom the headroom of the msgb when receiving data
@@ -552,7 +552,7 @@
iofd->tx_queue.max_length = max_length;
}
-/*! Get the associated user-data from an iofd
+/*! Get the associated user-data from an iofd.
* \param[in] iofd the file descriptor
* \returns the data that was previously set with \ref osmo_iofd_setup()
*/
@@ -561,7 +561,7 @@
return iofd->data;
}
-/*! Set the associated user-data from an iofd
+/*! Set the associated user-data from an iofd.
* \param[in] iofd the file descriptor
* \param[in] data the data to set
*/
@@ -570,7 +570,7 @@
iofd->data = data;
}
-/*! Get the private number from an iofd
+/*! Get the private number from an iofd.
* \param[in] iofd the file descriptor
* \returns the private number that was previously set with \ref osmo_iofd_set_priv_nr()
*/
@@ -579,7 +579,7 @@
return iofd->priv_nr;
}
-/*! Set the private number from an iofd
+/*! Set the private number from an iofd.
* \param[in] iofd the file descriptor
* \param[in] priv_nr the private number to set
*/
@@ -588,7 +588,7 @@
iofd->priv_nr = priv_nr;
}
-/*! Get the underlying file descriptor from an iofd
+/*! Get the underlying file descriptor from an iofd.
* \param[in] iofd the file descriptor
* \returns the underlying file descriptor number */
int osmo_iofd_get_fd(const struct osmo_io_fd *iofd)
@@ -596,7 +596,7 @@
return iofd->fd;
}
-/*! Get the name of the file descriptor
+/*! Get the name of the file descriptor.
* \param[in] iofd the file descriptor
* \returns the name of the iofd as given in \ref osmo_iofd_setup() */
const char *osmo_iofd_get_name(const struct osmo_io_fd *iofd)
@@ -604,7 +604,7 @@
return iofd->name;
}
-/*! Set the name of the file descriptor
+/*! Set the name of the file descriptor.
* \param[in] iofd the file descriptor
* \param[in] name the name to set on the file descriptor */
void osmo_iofd_set_name(struct osmo_io_fd *iofd, const char *name)
@@ -612,7 +612,7 @@
osmo_talloc_replace_string(iofd, &iofd->name, name);
}
-/*! Set the osmo_io_ops for an iofd
+/*! Set the osmo_io_ops for an iofd.
* \param[in] iofd Target iofd file descriptor
* \param[in] ioops osmo_io_ops structure to be set */
void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops)
@@ -620,7 +620,7 @@
iofd->io_ops = *ioops;
}
-/*! Notify the user if/when the socket is connected
+/*! Notify the user if/when the socket is connected.
* When the socket is connected the write_cb will be called.
* \param[in] iofd the file descriptor */
void osmo_iofd_notify_connected(struct osmo_io_fd *iofd)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33716
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I397304eed524db12e60a6534d21ea268f304cfdc
Gerrit-Change-Number: 33716
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels.
Hello Jenkins Builder, neels, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/33685
to look at the new patch set (#2).
Change subject: osmo_io: Document expectation that segmentation_cb() can modify msgb
......................................................................
osmo_io: Document expectation that segmentation_cb() can modify msgb
This is used for parsing e.g. the ipa header and setting msg->cb.
Guard against segmentation_cb changing msg->data in
iofd_handle_segmentation().
Change-Id: Idd2115baae98a7818aabb26232d4423d2d48fb5c
---
M include/osmocom/core/osmo_io.h
M src/core/osmo_io.c
2 files changed, 26 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/33685/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33685
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Idd2115baae98a7818aabb26232d4423d2d48fb5c
Gerrit-Change-Number: 33685
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33685 )
Change subject: osmo_io: Document expectation that segmentation_cb() can modify msgb
......................................................................
Patch Set 2:
(1 comment)
File include/osmocom/core/osmo_io.h:
https://gerrit.osmocom.org/c/libosmocore/+/33685/comment/a3a7ad7d_fbb4ac85
PS1, Line 50: will be trimmed to size
> i find it ambiguous: is this something that always happens before/after calling segmentation_cb(), o […]
I tried to clarify it in the documentation. segmentation_cb() itself doesn't split up anything, the calling function does that.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33685
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Idd2115baae98a7818aabb26232d4423d2d48fb5c
Gerrit-Change-Number: 33685
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 09:59:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33686 )
Change subject: osmo_io: Add function to change the maximum length of the tx_queue
......................................................................
Patch Set 3:
(2 comments)
File src/core/osmo_io.c:
https://gerrit.osmocom.org/c/libosmocore/+/33686/comment/cf0db5b6_d79c841f
PS2, Line 545: g
> (end in a dot for doxygen AUTO_BRIEF)
Thanks, I'll change all the other doc comments in a separate commit
https://gerrit.osmocom.org/c/libosmocore/+/33686/comment/29dba36d_17a7e140
PS2, Line 549: void osmo_iofd_set_txqueue_max_length(struct osmo_io_fd *iofd, unsigned int size)
> (i find mildly curious mixing of "max_length" and "size" and "maximum size" terms, would rather stic […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33686
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If3d1de8bffe1123002515878655ea9e02b482888
Gerrit-Change-Number: 33686
Gerrit-PatchSet: 3
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 09:59:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment