Move assert()s that dereference a pointer to after the pointer NULL check.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 6aa871717563e8ea07cf813fd9a5be11fddfae89..f895e02f6b50dffebc28e80232fd0f3ef8141eaa 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -168,7 +168,7 @@ struct meshlink_handle {
 
        bool default_blacklist;
        bool discovery;         // Whether Catta is enabled or not
-
+       bool inviter_commits_first;
 
        // Configuration
        char *confbase;
@@ -192,17 +192,6 @@ struct meshlink_handle {
        char *catta_servicetype;
        unsigned int catta_interfaces;
 
-       // State used for meshlink_join()
-       int sock;
-       char cookie[18], hash[18];
-       bool success;
-       sptps_t sptps;
-       char *data;
-       size_t thedatalen;
-       size_t blen;
-       char line[4096];
-       char buffer[4096];
-
        // Proxy configuration, currently not exposed.
        char *proxyhost;
        char *proxyport;