@alteriom/painlessmesh 1.6.1 → 1.7.3

package/src/painlessmesh/layout.hpp

@@ -1,188 +1,188 @@
-#ifndef _PAINLESS_MESH_LAYOUT_HPP_
-#define _PAINLESS_MESH_LAYOUT_HPP_
-
-#include <list>
-#include <memory>
-
-#include "painlessmesh/protocol.hpp"
-
-namespace painlessmesh {
-namespace layout {
-
-#include <memory>
-/**
- * Whether the tree contains the given nodeId
- */
-inline bool contains(protocol::NodeTree nodeTree, uint32_t nodeId) {
-  if (nodeTree.nodeId == nodeId) {
-    return true;
-  }
-  for (auto&& s : nodeTree.subs) {
-    if (contains(s, nodeId)) return true;
-  }
-  return false;
-}
-
-inline protocol::NodeTree excludeRoute(protocol::NodeTree&& tree,
-                                       uint32_t exclude) {
-  // Make sure to exclude any subs with nodeId == 0,
-  // even if exlude is not set to zero
-  tree.subs.remove_if([exclude](protocol::NodeTree s) {
-    return s.nodeId == 0 || s.nodeId == exclude;
-  });
-  return tree;
-}
-
-template <class T>
-class Layout {
- public:
-  size_t stability = 0;
-  std::list<std::shared_ptr<T> > subs;
-
-  /** Return the nodeId of the node that we are running on.
-   *
-   * On the ESP hardware nodeId is uniquely calculated from the MAC address of
-   * the node.
-   */
-  uint32_t getNodeId() { return nodeId; }
-
-  /**
-   * Check whether this node is a root node.
-   */
-  bool isRoot() { return root; }
-
-  protocol::NodeTree asNodeTree() {
-    auto nt = protocol::NodeTree(nodeId, root);
-    for (auto&& s : subs) {
-      if (s->nodeId == 0) continue;
-      nt.subs.push_back(protocol::NodeTree(*s));
-    }
-    return nt;
-  }
-
- protected:
-  uint32_t nodeId = 0;
-  bool root = false;
-};
-
-template <class T>
-void syncLayout(Layout<T>& layout, uint32_t changedId) {
-  // TODO: this should be called from changed connections and dropped
-  // connections events
-  for (auto&& sub : layout.subs) {
-    if (sub->connected() && !sub->newConnection && sub->nodeId != 0 &&
-        sub->nodeId != changedId) {  // Exclude current
-      sub->nodeSyncTask.forceNextIteration();
-    }
-  }
-  layout.stability /= 2;
-}
-
-class Neighbour : public protocol::NodeTree {
- public:
-  // Inherit constructors
-  using protocol::NodeTree::NodeTree;
-
-  /**
-   * Is the passed nodesync valid
-   *
-   * If not then the caller of this function should probably disconnect
-   * this neighbour.
-   */
-  bool validSubs(protocol::NodeTree tree) {
-    if (nodeId == 0)  // Cant really know, so valid as far as we know
-      return true;
-    if (nodeId != tree.nodeId) return false;
-    for (auto&& s : tree.subs) {
-      if (layout::contains(s, nodeId)) return false;
-    }
-    return true;
-  }
-
-  /**
-   * Update subs with the new subs
-   *
-   * \param tree The possible new tree with this node as base
-   *
-   * Generally one probably wants to call validSubs before calling this
-   * function.
-   *
-   * \return Whether we adopted the new tree
-   */
-  bool updateSubs(protocol::NodeTree tree) {
-    if (nodeId == 0 || tree != (*this)) {
-      nodeId = tree.nodeId;
-      subs = tree.subs;
-      root = tree.root;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Create a request
-   */
-  protocol::NodeSyncRequest request(NodeTree&& layout) {
-    auto subTree = excludeRoute(std::move(layout), nodeId);
-    return protocol::NodeSyncRequest(subTree.nodeId, nodeId, subTree.subs,
-                                     subTree.root);
-  }
-
-  /**
-   * Create a reply
-   */
-  protocol::NodeSyncReply reply(NodeTree&& layout) {
-    auto subTree = excludeRoute(std::move(layout), nodeId);
-    return protocol::NodeSyncReply(subTree.nodeId, nodeId, subTree.subs,
-                                   subTree.root);
-  }
-};
-
-/**
- * The size of the mesh (the number of nodes)
- */
-inline uint32_t size(protocol::NodeTree nodeTree) {
-  auto no = 1;
-  for (auto&& s : nodeTree.subs) {
-    no += size(s);
-  }
-  return no;
-}
-
-/**
- * Whether the top node in the tree is also the root of the mesh
- */
-inline bool isRoot(protocol::NodeTree nodeTree) {
-  if (nodeTree.root) return true;
-  return false;
-}
-
-/**
- * Whether any node in the tree is also root of the mesh
- */
-inline bool isRooted(protocol::NodeTree nodeTree) {
-  if (isRoot(nodeTree)) return true;
-  for (auto&& s : nodeTree.subs) {
-    if (isRooted(s)) return true;
-  }
-  return false;
-}
-
-/**
- * Return all nodes in a list container
- */
-inline std::list<uint32_t> asList(protocol::NodeTree nodeTree,
-                                  bool includeSelf = true) {
-  std::list<uint32_t> lst;
-  if (includeSelf) lst.push_back(nodeTree.nodeId);
-  for (auto&& s : nodeTree.subs) {
-    lst.splice(lst.end(), asList(s));
-  }
-  return lst;
-}
-
-}  // namespace layout
-}  // namespace painlessmesh
-
-#endif
-
+#ifndef _PAINLESS_MESH_LAYOUT_HPP_
+#define _PAINLESS_MESH_LAYOUT_HPP_
+
+#include <list>
+#include <memory>
+
+#include "painlessmesh/protocol.hpp"
+
+namespace painlessmesh {
+namespace layout {
+
+#include <memory>
+/**
+ * Whether the tree contains the given nodeId
+ */
+inline bool contains(protocol::NodeTree nodeTree, uint32_t nodeId) {
+  if (nodeTree.nodeId == nodeId) {
+    return true;
+  }
+  for (auto&& s : nodeTree.subs) {
+    if (contains(s, nodeId)) return true;
+  }
+  return false;
+}
+
+inline protocol::NodeTree excludeRoute(protocol::NodeTree&& tree,
+                                       uint32_t exclude) {
+  // Make sure to exclude any subs with nodeId == 0,
+  // even if exlude is not set to zero
+  tree.subs.remove_if([exclude](protocol::NodeTree s) {
+    return s.nodeId == 0 || s.nodeId == exclude;
+  });
+  return tree;
+}
+
+template <class T>
+class Layout {
+ public:
+  size_t stability = 0;
+  std::list<std::shared_ptr<T> > subs;
+
+  /** Return the nodeId of the node that we are running on.
+   *
+   * On the ESP hardware nodeId is uniquely calculated from the MAC address of
+   * the node.
+   */
+  uint32_t getNodeId() { return nodeId; }
+
+  /**
+   * Check whether this node is a root node.
+   */
+  bool isRoot() { return root; }
+
+  protocol::NodeTree asNodeTree() {
+    auto nt = protocol::NodeTree(nodeId, root);
+    for (auto&& s : subs) {
+      if (s->nodeId == 0) continue;
+      nt.subs.push_back(protocol::NodeTree(*s));
+    }
+    return nt;
+  }
+
+ protected:
+  uint32_t nodeId = 0;
+  bool root = false;
+};
+
+template <class T>
+void syncLayout(Layout<T>& layout, uint32_t changedId) {
+  // TODO: this should be called from changed connections and dropped
+  // connections events
+  for (auto&& sub : layout.subs) {
+    if (sub->connected() && !sub->newConnection && sub->nodeId != 0 &&
+        sub->nodeId != changedId) {  // Exclude current
+      sub->nodeSyncTask.forceNextIteration();
+    }
+  }
+  layout.stability /= 2;
+}
+
+class Neighbour : public protocol::NodeTree {
+ public:
+  // Inherit constructors
+  using protocol::NodeTree::NodeTree;
+
+  /**
+   * Is the passed nodesync valid
+   *
+   * If not then the caller of this function should probably disconnect
+   * this neighbour.
+   */
+  bool validSubs(protocol::NodeTree tree) {
+    if (nodeId == 0)  // Cant really know, so valid as far as we know
+      return true;
+    if (nodeId != tree.nodeId) return false;
+    for (auto&& s : tree.subs) {
+      if (layout::contains(s, nodeId)) return false;
+    }
+    return true;
+  }
+
+  /**
+   * Update subs with the new subs
+   *
+   * \param tree The possible new tree with this node as base
+   *
+   * Generally one probably wants to call validSubs before calling this
+   * function.
+   *
+   * \return Whether we adopted the new tree
+   */
+  bool updateSubs(protocol::NodeTree tree) {
+    if (nodeId == 0 || tree != (*this)) {
+      nodeId = tree.nodeId;
+      subs = tree.subs;
+      root = tree.root;
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Create a request
+   */
+  protocol::NodeSyncRequest request(NodeTree&& layout) {
+    auto subTree = excludeRoute(std::move(layout), nodeId);
+    return protocol::NodeSyncRequest(subTree.nodeId, nodeId, subTree.subs,
+                                     subTree.root);
+  }
+
+  /**
+   * Create a reply
+   */
+  protocol::NodeSyncReply reply(NodeTree&& layout) {
+    auto subTree = excludeRoute(std::move(layout), nodeId);
+    return protocol::NodeSyncReply(subTree.nodeId, nodeId, subTree.subs,
+                                   subTree.root);
+  }
+};
+
+/**
+ * The size of the mesh (the number of nodes)
+ */
+inline uint32_t size(protocol::NodeTree nodeTree) {
+  auto no = 1;
+  for (auto&& s : nodeTree.subs) {
+    no += size(s);
+  }
+  return no;
+}
+
+/**
+ * Whether the top node in the tree is also the root of the mesh
+ */
+inline bool isRoot(protocol::NodeTree nodeTree) {
+  if (nodeTree.root) return true;
+  return false;
+}
+
+/**
+ * Whether any node in the tree is also root of the mesh
+ */
+inline bool isRooted(protocol::NodeTree nodeTree) {
+  if (isRoot(nodeTree)) return true;
+  for (auto&& s : nodeTree.subs) {
+    if (isRooted(s)) return true;
+  }
+  return false;
+}
+
+/**
+ * Return all nodes in a list container
+ */
+inline std::list<uint32_t> asList(protocol::NodeTree nodeTree,
+                                  bool includeSelf = true) {
+  std::list<uint32_t> lst;
+  if (includeSelf) lst.push_back(nodeTree.nodeId);
+  for (auto&& s : nodeTree.subs) {
+    lst.splice(lst.end(), asList(s));
+  }
+  return lst;
+}
+
+}  // namespace layout
+}  // namespace painlessmesh
+
+#endif
+