fixed some potentially nasty memory issues

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 5f5539a272b137aba704cd0253fcf347ece50dde..ef578b113068cc8993bf3728d547f194c45bf06a 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -88,7 +88,7 @@ namespace meshlink {
        /// A class describing a MeshLink mesh.
        class mesh: public meshlink_handle_t {
        public:
-               mesh() {}
+               mesh() : meshlink_handle_t() {}
        
                virtual ~mesh() {
                        meshlink_close(this);

diff --git a/src/meshlink.h b/src/meshlink.h
index 9f6c63ceb5e55616c6e7662f2e1940b58c9a4d24..e9c531ff27008bed4a6518aa095a6a8984434d9a 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -85,14 +85,14 @@ extern __thread meshlink_errno_t meshlink_errno;
 #ifndef MESHLINK_INTERNAL_H
 
 struct meshlink_handle {
-       const char *name;
+       char *name;
        char *appname;
        dev_class_t devclass;
        void *priv;
 };
 
 struct meshlink_node {
-       const char *name; ///< Textual name of this node. It is stored in a nul-terminated C string, which is allocated by MeshLink.
+       char *name;       ///< Textual name of this node. It is stored in a nul-terminated C string, which is allocated by MeshLink.
        void *priv;       ///< Private pointer which may be set freely by the application, and is never used or modified by MeshLink.
 };
 

diff --git a/src/net.c b/src/net.c
index 6528fab9833fd82c364b752bf9308bae4c5c7424..9659a8f26236f19b8e0e7d8859744d5a7dd38673 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -364,7 +364,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                        {
                                logger(mesh, MESHLINK_INFO, "* found best one for initial connect");
 
-                               timeout = 0;
+                               //timeout = 0;
                                connect_to = (node_t*)nodes->head->data;
                        }
 
@@ -501,7 +501,7 @@ static void periodic_handler(event_loop_t *loop, void *data) {
                        {
                                logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections");
 
-                               timeout = 0;
+                               //timeout = 0;
                                disconnect_from = (node_t*)nodes->head->data;
                        }
 

diff --git a/src/node.h b/src/node.h
index 23237522f89468b365ed0d2e6fcdf3db8eddfe0a..409449c94e80ed1c382d82522c275474ee86d7dc 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -40,6 +40,8 @@ typedef struct node_status_t {
 
 typedef struct node_t {
        char *name;                             /* name of this node */
+       void *priv;
+       
        uint32_t options;                       /* options turned on for this node */
        dev_class_t devclass;