A first attempt at merging UTCP into MeshLink.

[meshlink] / src / meshlink++.h

diff --git a/src/meshlink++.h b/src/meshlink++.h
index dc32855a212a869e52b77eaf90f2bb016a0bb396..a1911affbdb1d949049e343b5cae5a4d732f0391 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -66,7 +66,7 @@ namespace meshlink {
         *  @return             This function should return true if the application accepts the incoming channel, false otherwise.
         *                      If returning false, the channel is invalid and may not be used anymore.
         */
-       typedef bool (*channel_accept_cb_t)(mesh *mesh, channel *channel, node *node, uint16_t port, void *data, size_t len);
+       typedef bool (*channel_accept_cb_t)(mesh *mesh, channel *channel, node *node, uint16_t port, const void *data, size_t len);
 
        /// A callback for receiving data from a channel.
        /** @param mesh         A handle which represents an instance of MeshLink.
@@ -74,7 +74,7 @@ namespace meshlink {
         *  @param data         A pointer to a buffer containing data sent by the source.
         *  @param len          The length of the data.
         */
-       typedef void (*channel_receive_cb_t)(mesh *mesh, channel *channel, void *data, size_t len);
+       typedef void (*channel_receive_cb_t)(mesh *mesh, channel *channel, const void *data, size_t len);
 
        /// A class describing a MeshLink node.
        class node: public meshlink_node_t {
@@ -299,6 +299,7 @@ namespace meshlink {
                 *  to hand the data over to the application's thread.
                 *  The callback should also not block itself and return as quickly as possible.
                 *
+                *  @param channel   A handle for the channel.
                 *  @param cb        A pointer to the function which will be called when another node sends data to the local node.
                 */
                void set_channel_accept_cb(channel *channel, channel_accept_cb_t cb) {
@@ -317,7 +318,7 @@ namespace meshlink {
                 *
                 *  @return             A handle for the channel, or NULL in case of an error.
                 */
-               channel *channel_open(node *node, uint16_t port, channel_receive_cb_t recv, void *data, size_t len) {
+               channel *channel_open(node *node, uint16_t port, channel_receive_cb_t cb, const void *data, size_t len) {
                        return (channel *)meshlink_channel_open(this, node, port, (meshlink_channel_receive_cb_t)recv, data, len);
                }