X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink%2B%2B.h;h=83eafdfa15c26e852b5417445388953c779889f2;hb=b5a8aaba0ae78e93f8a972c9c7911fc2bc664b4e;hp=6a3841663bc95473f6952178b1564e551d561264;hpb=b67296418c51784d39a24c3041e2cb199bee06f2;p=meshlink

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 6a384166..83eafdfa 100644
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -174,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.
 	/**
@@ -203,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;
 	}
 
@@ -217,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.
 	/**
@@ -229,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
@@ -359,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.
@@ -574,7 +603,7 @@ 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) {