Add a test for a constellation of three nodes.

[meshlink] / src / meshlink++.h

diff --git a/src/meshlink++.h b/src/meshlink++.h
index df0a72b594431cf779df8cabbc9e87375c56bc94..a949f761e935436f8baabdd3699ff7176f1671cc 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINKPP_H
+#define MESHLINKPP_H
+
 /*
     meshlink++.h -- MeshLink C++ API
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINKPP_H
-#define MESHLINKPP_H
-
 #include <meshlink.h>
 #include <new> // for 'placement new'
 
@@ -108,7 +108,7 @@ public:
        }
 
        bool isOpen() const {
-               return (handle!=0);
+               return (handle != 0);
        }
 
 // TODO: please enable C++11 in autoconf to enable "move constructors":
@@ -137,7 +137,7 @@ public:
         *
         *  @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) {
+       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;
@@ -145,7 +145,7 @@ public:
                return isOpen();
        }
 
-       mesh(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
+       mesh(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
                open(confbase, name, appname, devclass);
        }
 
@@ -159,7 +159,7 @@ public:
                        handle->priv = 0;
                        meshlink_close(handle);
                }
-               handle=0;
+               handle = 0;
        }
 
        /** instead of registerin callbacks you derive your own class and overwrite the following abstract member functions.
@@ -171,13 +171,13 @@ public:
         */
 
        /// 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 */ }
+       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 */ }
+       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 */ }
+       virtual void log(log_level_t level, const char *message)            { /* do nothing */ }
 
        /// This functions is called whenever another node attemps to open a channel to the local node.
        /**
@@ -558,38 +558,48 @@ public:
                return meshlink_channel_send(handle, channel, data, len);
        }
 
+       /// Enable or disable zeroconf discovery of local peers
+       /** This controls whether zeroconf discovery using the Catta library will be
+        *  enabled to search for peers on the local network. By default, it is enabled.
+        *
+        *  @param enable  Set to true to enable discovery, false to disable.
+        */
+       void enable_discovery(bool enable = true) {
+               meshlink_enable_discovery(handle, enable);
+       }
+
 private:
        // non-copyable:
-       mesh(const mesh&) /* TODO: C++11: = delete */;
-       void operator=(const mesh&) /* TODO: C++11: = delete */ ;
+       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) {
+       static void receive_trampoline(meshlink_handle_t *handle, meshlink_node_t *source, const void *data, size_t length) {
                if(!(handle->priv))
                        return;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
-               that->receive(static_cast<node*>(source), data, length);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+               that->receive(static_cast<node *>(source), data, length);
        }
 
-       static void node_status_trampoline(meshlink_handle_t* handle, meshlink_node_t* peer, bool reachable) {
+       static void node_status_trampoline(meshlink_handle_t *handle, meshlink_node_t *peer, bool reachable) {
                if(!(handle->priv))
                        return;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
-               that->node_status(static_cast<node*>(peer), reachable);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+               that->node_status(static_cast<node *>(peer), reachable);
        }
 
-       static void log_trampoline(meshlink_handle_t* handle, log_level_t level, const char* message) {
+       static void log_trampoline(meshlink_handle_t *handle, log_level_t level, const char *message) {
                if(!(handle->priv))
                        return;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
                that->log(level, message);
        }
 
        static bool channel_accept_trampoline(meshlink_handle_t *handle, meshlink_channel *channel, uint16_t port, const void *data, size_t len) {
                if(!(handle->priv))
                        return false;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
-               bool accepted = that->channel_accept(static_cast<meshlink::channel*>(channel), port, data, len);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+               bool accepted = that->channel_accept(static_cast<meshlink::channel *>(channel), port, data, len);
                if(accepted) {
                        meshlink_set_channel_receive_cb(handle, channel, &channel_receive_trampoline);
                        meshlink_set_channel_poll_cb(handle, channel, &channel_poll_trampoline);
@@ -597,21 +607,21 @@ private:
                return accepted;
        }
 
-       static void channel_receive_trampoline(meshlink_handle_t *handle, meshlink_channel *channel, const void* data, size_t len) {
+       static void channel_receive_trampoline(meshlink_handle_t *handle, meshlink_channel *channel, const void *data, size_t len) {
                if(!(handle->priv))
                        return;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
-               that->channel_receive(static_cast<meshlink::channel*>(channel), data, len);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+               that->channel_receive(static_cast<meshlink::channel *>(channel), data, len);
        }
 
        static void channel_poll_trampoline(meshlink_handle_t *handle, meshlink_channel *channel, size_t len) {
                if(!(handle->priv))
                        return;
-               meshlink::mesh* that = static_cast<mesh*>(handle->priv);
-               that->channel_poll(static_cast<meshlink::channel*>(channel), len);
+               meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+               that->channel_poll(static_cast<meshlink::channel *>(channel), len);
        }
 
-       meshlink_handle_t* handle;
+       meshlink_handle_t *handle;
 };
 
 static const char *strerror(errno_t err = meshlink_errno) {
@@ -633,4 +643,4 @@ static bool destroy(const char *confbase) {
 }
 }
 
-#endif // MESHLINKPP_H
+#endif