]> git.meshlink.io Git - meshlink/blobdiff - src/meshlink++.h
Code reformatting.
[meshlink] / src / meshlink++.h
index bfc7173d8d3cf19d6e65655595e4016b32ad3310..83eafdfa15c26e852b5417445388953c779889f2 100644 (file)
@@ -139,8 +139,10 @@ public:
         */
        bool open(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
                handle = meshlink_open(confbase, name, appname, devclass);
-               if(handle)
+
+               if(handle) {
                        handle->priv = this;
+               }
 
                return isOpen();
        }
@@ -159,6 +161,7 @@ public:
                        handle->priv = 0;
                        meshlink_close(handle);
                }
+
                handle = 0;
        }
 
@@ -171,13 +174,26 @@ 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 */
+               (void)source;
+               (void)data;
+               (void) length;
+       }
 
        /// 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 */
+               (void)peer;
+               (void)reachable;
+       }
 
        /// 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 */
+               (void)level;
+               (void)message;
+       }
 
        /// This functions is called whenever another node attemps to open a channel to the local node.
        /**
@@ -200,6 +216,10 @@ public:
         */
        virtual bool channel_accept(channel *channel, uint16_t port, const void *data, size_t len) {
                /* by default reject all channels */
+               (void)channel;
+               (void)port;
+               (void)data;
+               (void)len;
                return false;
        }
 
@@ -214,7 +234,12 @@ public:
         *  @param data         A pointer to a buffer containing data sent by the source.
         *  @param len          The length of the data.
         */
-       virtual void channel_receive(channel *channel, const void *data, size_t len) { /* do nothing */ }
+       virtual void channel_receive(channel *channel, const void *data, size_t len) {
+               /* do nothing */
+               (void)channel;
+               (void)data;
+               (void)len;
+       }
 
        /// This function is called by Meshlink when data can be send on a channel.
        /**
@@ -226,7 +251,11 @@ public:
         *  @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().
         */
-       virtual void channel_poll(channel *channel, size_t len) { /* do nothing */ }
+       virtual void channel_poll(channel *channel, size_t len) {
+               /* do nothing */
+               (void)channel;
+               (void)len;
+       }
 
        /// Start MeshLink.
        /** This function causes MeshLink to open network sockets, make outgoing connections, and
@@ -356,12 +385,15 @@ public:
         *  There is no guarantee it will be able to resolve the external address.
         *  Failures might be because by temporary network outages.
         *
+        *  @param family       The address family to check, for example AF_INET or AF_INET6. If AF_UNSPEC is given,
+        *                      this might return the external address for any working address family.
+        *
         *  @return             This function returns a pointer to a C string containing the discovered external address,
         *                      or NULL if there was an error looking up the address.
         *                      After get_external_address() returns, the application is free to overwrite or free this string.
         */
-       bool get_external_address() {
-               return meshlink_get_external_address(handle);
+       bool get_external_address(int family = AF_UNSPEC) {
+               return meshlink_get_external_address_for_family(handle, family);
        }
 
        /// Try to discover the external address for the local node, and add it to its list of addresses.
@@ -571,52 +603,66 @@ public:
 private:
        // non-copyable:
        mesh(const mesh &) /* TODO: C++11: = delete */;
-       void operator=(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) {
-               if(!(handle->priv))
+               if(!(handle->priv)) {
                        return;
+               }
+
                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) {
-               if(!(handle->priv))
+               if(!(handle->priv)) {
                        return;
+               }
+
                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) {
-               if(!(handle->priv))
+               if(!(handle->priv)) {
                        return;
+               }
+
                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))
+               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);
+
                if(accepted) {
                        meshlink_set_channel_receive_cb(handle, channel, &channel_receive_trampoline);
                        meshlink_set_channel_poll_cb(handle, channel, &channel_poll_trampoline);
                }
+
                return accepted;
        }
 
        static void channel_receive_trampoline(meshlink_handle_t *handle, meshlink_channel *channel, const void *data, size_t len) {
-               if(!(handle->priv))
+               if(!(handle->priv)) {
                        return;
+               }
+
                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))
+               if(!(handle->priv)) {
                        return;
+               }
+
                meshlink::mesh *that = static_cast<mesh *>(handle->priv);
                that->channel_poll(static_cast<meshlink::channel *>(channel), len);
        }