X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink%2B%2B.h;h=7be3de51768d424be132e44644481cb74ee2723b;hb=fe1a9111456a73a6e690927e90d8bfa1e1d0ad22;hp=a357cca6516e24d96c0e13e23c7f570b6305b545;hpb=0754f0dda52c1b6870732be98b7697be5f4ba9cd;p=meshlink diff --git a/src/meshlink++.h b/src/meshlink++.h index a357cca6..7be3de51 100644 --- a/src/meshlink++.h +++ b/src/meshlink++.h @@ -21,6 +21,7 @@ #define MESHLINKPP_H #include +#include // for 'placement new' namespace meshlink { class mesh; @@ -76,6 +77,13 @@ namespace meshlink { */ typedef void (*channel_receive_cb_t)(mesh *mesh, channel *channel, const void *data, size_t len); + /// A callback that is called when data can be send on a channel. + /** @param mesh A handle which represents an instance of MeshLink. + * @param channel A handle for the channel. + * @param len The maximum length of data that is guaranteed to be accepted by a call to channel_send(). + */ + typedef void (*channel_poll_cb_t)(mesh *mesh, channel *channel, size_t len); + /// A class describing a MeshLink node. class node: public meshlink_node_t { }; @@ -85,10 +93,84 @@ namespace meshlink { }; /// A class describing a MeshLink mesh. - class mesh: public meshlink_handle_t { - public: - // TODO: delete constructor, add a destructor. - + class mesh { + public: + mesh() : handle(0) {} + + virtual ~mesh() { + this->close(); + } + + bool isOpen() const { + return (handle!=0); + } + +// TODO: please enable C++11 in autoconf to enable "move constructors": +// mesh(mesh&& other) +// : handle(other.handle) +// { +// if(handle) +// handle->priv = this; +// other.handle = 0; +// } + + /// Initialize MeshLink's configuration directory. + /** This function causes MeshLink to initialize its configuration directory, + * if it hasn't already been initialized. + * It only has to be run the first time the application starts, + * but it is not a problem if it is run more than once, as long as + * the arguments given are the same. + * + * This function does not start any network I/O yet. The application should + * first set callbacks, and then call meshlink_start(). + * + * @param confbase The directory in which MeshLink will store its configuration files. + * @param name The name which this instance of the application will use in the mesh. + * @param appname The application name which will be used in the mesh. + * @param dclass The device class which will be used in the mesh. + * + * @return This function will return a pointer to a meshlink::mesh if MeshLink has succesfully set up its configuration files, NULL otherwise. + */ + bool open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) { + handle = meshlink_open(confbase, name, appname, devclass); + if(handle) + handle->priv = this; + + return isOpen(); + } + + mesh(const char *confbase, const char *name, const char* appname, dev_class_t devclass) { + open(confbase, name, appname, devclass); + } + + /// Close the MeshLink handle. + /** This function calls meshlink_stop() if necessary, + * and frees all memory allocated by MeshLink. + * Afterwards, the handle and any pointers to a struct meshlink_node are invalid. + */ + void close() { + if(handle) + meshlink_close(handle); + handle=0; + } + + /** instead of registerin callbacks you derive your own class and overwrite the following abstract member functions. + * These functions are run in MeshLink's own thread. + * It is therefore important that these functions use apprioriate methods (queues, pipes, locking, etc.) + * to hand the data over to the application's thread. + * These functions should also not block itself and return as quickly as possible. + * The default member functions are no-ops, so you are not required to overwrite all these member functions + */ + + /// This function is called whenever another node sends data to the local node. + virtual void receive(node* source, const void* data, size_t length) { /* do nothing */ } + + /// This functions is called whenever another node's status changed. + virtual void node_status(node* peer, bool reachable) { /* do nothing */ } + + /// This functions is called whenever MeshLink has some information to log. + virtual void log(log_level_t level, const char* message) { /* do nothing */ } + /// Start MeshLink. /** This function causes MeshLink to open network sockets, make outgoing connections, and * create a new thread, which will handle all network I/O. @@ -96,7 +178,10 @@ namespace meshlink { * @return This function will return true if MeshLink has succesfully started its thread, false otherwise. */ bool start() { - return meshlink_start(this); + meshlink_set_receive_cb (handle, &receive_trampoline); + meshlink_set_node_status_cb(handle, &node_status_trampoline); + meshlink_set_log_cb (handle, MESHLINK_DEBUG, &log_trampoline); + return meshlink_start (handle); } /// Stop MeshLink. @@ -104,47 +189,7 @@ namespace meshlink { * close all sockets, and shut down its own thread. */ void stop() { - meshlink_stop(this); - } - - /// Set the receive callback. - /** This functions sets the callback that is called whenever another node sends data to the local node. - * The callback is run in MeshLink's own thread. - * It is therefore important that the callback uses apprioriate methods (queues, pipes, locking, etc.) - * to hand the data over to the application's thread. - * The callback should also not block itself and return as quickly as possible. - * - * @param cb A pointer to the function which will be called when another node sends data to the local node. - */ - void set_receive_cb(receive_cb_t cb) { - meshlink_set_receive_cb(this, (meshlink_receive_cb_t)cb); - } - - /// Set the node status callback. - /** This functions sets the callback that is called whenever another node's status changed. - * The callback is run in MeshLink's own thread. - * It is therefore important that the callback uses apprioriate methods (queues, pipes, locking, etc.) - * to hand the data over to the application's thread. - * The callback should also not block itself and return as quickly as possible. - * - * @param cb A pointer to the function which will be called when another node's status changes. - */ - void set_node_status_cb(node_status_cb_t cb) { - meshlink_set_node_status_cb(this, (meshlink_node_status_cb_t)cb); - } - - /// Set the log callback. - /** This functions sets the callback that is called whenever MeshLink has some information to log. - * The callback is run in MeshLink's own thread. - * It is important that the callback uses apprioriate methods (queues, pipes, locking, etc.) - * to hand the data over to the application's thread. - * The callback should also not block itself and return as quickly as possible. - * - * @param level An enum describing the minimum severity level. Debugging information with a lower level will not trigger the callback. - * @param cb A pointer to the function which will be called when another node sends data to the local node. - */ - void set_log_cb(meshlink_log_level_t level, log_cb_t cb) { - meshlink_set_log_cb(this, level, (meshlink_log_cb_t)cb); + meshlink_stop(handle); } /// Send data to another node. @@ -161,7 +206,7 @@ namespace meshlink { * A return value of true does not guarantee that the message will actually arrive at the destination. */ bool send(node *destination, const void *data, unsigned int len) { - return meshlink_send(this, destination, data, len); + return meshlink_send(handle, destination, data, len); } /// Get a handle for a specific node. @@ -173,7 +218,7 @@ namespace meshlink { * or NULL if the requested node does not exist. */ node *get_node(const char *name) { - return (node *)meshlink_get_node(this, name); + return (node *)meshlink_get_node(handle, name); } /// Get a list of all nodes. @@ -182,10 +227,11 @@ namespace meshlink { * @param nodes A pointer to an array of pointers to meshlink::node, which should be allocated by the application. * @param nmemb The maximum number of pointers that can be stored in the nodes array. * - * @return The number of known nodes. This can be larger than nmemb, in which case not all nodes were stored in the nodes array. + * @return The number of known nodes, or -1 in case of an error. + * This can be larger than nmemb, in which case not all nodes were stored in the nodes array. */ - size_t get_all_nodes(node **nodes, size_t nmemb) { - return meshlink_get_all_nodes(this, (meshlink_node_t **)nodes, nmemb); + node **get_all_nodes(node **nodes, size_t *nmemb) { + return (node **)meshlink_get_all_nodes(handle, (meshlink_node_t **)nodes, nmemb); } /// Sign data using the local node's MeshLink key. @@ -200,7 +246,7 @@ namespace meshlink { * @return This function returns true if the signature is valid, false otherwise. */ bool sign(const void *data, size_t len, void *signature, size_t *siglen) { - return meshlink_sign(this, data, len, signature, siglen); + return meshlink_sign(handle, data, len, signature, siglen); } /// Verify the signature generated by another node of a piece of data. @@ -215,7 +261,7 @@ namespace meshlink { * @return This function returns true if the signature is valid, false otherwise. */ bool verify(node *source, const void *data, size_t len, const void *signature, size_t siglen) { - return meshlink_verify(this, source, data, len, signature, siglen); + return meshlink_verify(handle, source, data, len, signature, siglen); } /// Add an Address for the local node. @@ -226,7 +272,7 @@ namespace meshlink { * @return This function returns true if the address was added, false otherwise. */ bool add_address(const char *address) { - return meshlink_add_address(this, address); + return meshlink_add_address(handle, address); } /// Invite another node into the mesh. @@ -241,7 +287,7 @@ namespace meshlink { * The application should call free() after it has finished using the URL. */ char *invite(const char *name) { - return meshlink_invite(this, name); + return meshlink_invite(handle, name); } /// Use an invitation to join a mesh. @@ -254,7 +300,7 @@ namespace meshlink { * @return This function returns true if the local node joined the mesh it was invited to, false otherwise. */ bool join(const char *invitation) { - return meshlink_join(this, invitation); + return meshlink_join(handle, invitation); } /// Export the local node's key and addresses. @@ -266,7 +312,7 @@ namespace meshlink { * The application should call free() after it has finished using this string. */ char *export_key() { - return meshlink_export(this); + return meshlink_export(handle); } /// Import another node's key and addresses. @@ -278,7 +324,7 @@ namespace meshlink { * @return This function returns true if the data was valid and the other node has been granted access to the mesh, false otherwise. */ bool import_key(const char *data) { - return meshlink_import(this, data); + return meshlink_import(handle, data); } /// Blacklist a node from the mesh. @@ -289,7 +335,7 @@ namespace meshlink { * @param node A pointer to a meshlink::node describing the node to be blacklisted. */ void blacklist(node *node) { - return meshlink_blacklist(this, node); + return meshlink_blacklist(handle, node); } /// Set the accept callback. @@ -303,7 +349,22 @@ namespace meshlink { * @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) { - return meshlink_set_channel_accept_cb(this, (meshlink_channel_accept_cb_t)cb); + return meshlink_set_channel_accept_cb(handle, (meshlink_channel_accept_cb_t)cb); + } + + /// Set the poll callback. + /** This functions sets the callback that is called whenever data can be sent to another node. + * The callback is run in MeshLink's own thread. + * It is therefore important that the callback uses apprioriate methods (queues, pipes, locking, etc.) + * to pass data to or from 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 data can be sent to another node. + * If a NULL pointer is given, the callback will be disabled. + */ + void set_channel_poll_cb(channel *channel, channel_poll_cb_t cb) { + return meshlink_set_channel_poll_cb(handle, channel, (meshlink_channel_poll_cb_t)cb); } /// Open a reliable stream channel to another node. @@ -319,7 +380,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 cb, const void *data, size_t len) { - return (channel *)meshlink_channel_open(this, node, port, (meshlink_channel_receive_cb_t)cb, data, len); + return (channel *)meshlink_channel_open(handle, node, port, (meshlink_channel_receive_cb_t)cb, data, len); } /// Partially close a reliable stream channel. @@ -331,7 +392,7 @@ namespace meshlink { * @param direction Must be one of SHUT_RD, SHUT_WR or SHUT_RDWR. */ void channel_shutdown(channel *channel, int direction) { - return meshlink_channel_shutdown(this, channel, direction); + return meshlink_channel_shutdown(handle, channel, direction); } /// Close a reliable stream channel. @@ -342,7 +403,7 @@ namespace meshlink { * @param channel A handle for the channel. */ void channel_close(meshlink_channel_t *channel) { - return meshlink_channel_close(this, channel); + return meshlink_channel_close(handle, channel); } /// Transmit data on a channel @@ -355,42 +416,40 @@ namespace meshlink { * @return The amount of data that was queued, which can be less than len, or a negative value in case of an error. */ ssize_t channel_send(channel *channel, void *data, size_t len) { - return meshlink_channel_send(this, channel, data, len); + return meshlink_channel_send(handle, channel, data, len); } - }; - - /// Initialize MeshLink's configuration directory. - /** This function causes MeshLink to initialize its configuration directory, - * if it hasn't already been initialized. - * It only has to be run the first time the application starts, - * but it is not a problem if it is run more than once, as long as - * the arguments given are the same. - * - * This function does not start any network I/O yet. The application should - * first set callbacks, and then call meshlink_start(). - * - * @param confbase The directory in which MeshLink will store its configuration files. - * @param name The name which this instance of the application will use in the mesh. - * - * @return This function will return a pointer to a meshlink::mesh if MeshLink has succesfully set up its configuration files, NULL otherwise. - */ - static mesh *open(const char *confbase, const char *name) { - return (mesh *)meshlink_open(confbase, name); - } + private: + // non-copyable: + mesh(const mesh&) /* TODO: C++11: = delete */; + void operator=(const mesh&) /* TODO: C++11: = delete */ ; + + /// static callback trampolines: + static void receive_trampoline(meshlink_handle_t* handle, meshlink_node_t* source, const void* data, size_t length) + { + mesh* that = static_cast(handle->priv); + that->receive(static_cast(source), data, length); + } + + static void node_status_trampoline(meshlink_handle_t* handle, meshlink_node_t* peer, bool reachable) + { + mesh* that = static_cast(handle->priv); + that->node_status(static_cast(peer), reachable); + } - /// Close the MeshLink handle. - /** This function calls meshlink_stop() if necessary, - * and frees all memory allocated by MeshLink. - * Afterwards, the handle and any pointers to a struct meshlink_node are invalid. - */ - static void close(mesh *mesh) { - meshlink_close(mesh); - } + static void log_trampoline(meshlink_handle_t* handle, log_level_t level, const char* message) + { + mesh* that = static_cast(handle->priv); + that->log(level, message); + } + + meshlink_handle_t* handle; + }; static const char *strerror(errno_t err = meshlink_errno) { return meshlink_strerror(err); } -}; + +} #endif // MESHLINKPP_H