README updates, misc filename changes, debug trace fixes, introduction of libzt moniker

src/Connection.hpp

@@ -37,7 +37,7 @@
 #include "Phy.hpp"
 
 // SDK
-#include "ZeroTierSDK.h"
+#include "libzt.h"
 #include "SocketTap.hpp"
 //#include "RingBuffer.hpp"
 
@@ -72,7 +72,7 @@ namespace ZeroTier {
 
 		std::queue<Connection*> _AcceptedConnections;
 		SocketTap *tap; // Reference to SocketTap  
-		int state; // See ZeroTierSDK.h for (ZT_SOCK_STATE_*)
+		int state; // See libzt.h for (ZT_SOCK_STATE_*)
 
 		// timestamp for closure event
 		std::time_t closure_ts;

src/SocketTap.cpp

@@ -37,7 +37,7 @@
 
 // SDK
 #include "SocketTap.hpp"
-#include "ZeroTierSDK.h"
+#include "libzt.h"
 #include "picoTCP.hpp"
 
 // ZT

src/SocketTap.hpp

@@ -43,7 +43,7 @@
 #include "Thread.hpp"
 #include "Phy.hpp"
 
-#include "ZeroTierSDK.h"
+#include "libzt.h"
 #include "picoTCP.hpp"
 #include "Connection.hpp"
 
@@ -181,7 +181,7 @@ namespace ZeroTier {
 
 		/*
 		 * Timestamp of last run of housekeeping 
-		 * SEE: ZT_HOUSEKEEPING_INTERVAL in ZeroTierSDK.h
+		 * SEE: ZT_HOUSEKEEPING_INTERVAL in libzt.h
 		 */
 		std::time_t last_housekeeping_ts;
 

src/Utilities.cpp

@@ -42,53 +42,3 @@ void zt_dump_stacktrace(int sig) {
   exit(1);
 }
 */
-
-/*
-char *beautify_pico_error(int err)
-{
-	switch(err){
-		PICO_ERR_NOERR = 0,
-    PICO_ERR_EPERM = 1,
-    PICO_ERR_ENOENT = 2,
-    
-    PICO_ERR_EINTR = 4,
-    PICO_ERR_EIO = 5,
-    PICO_ERR_ENXIO = 6,
-    
-    PICO_ERR_EAGAIN = 11,
-    PICO_ERR_ENOMEM = 12,
-    PICO_ERR_EACCESS = 13,
-    PICO_ERR_EFAULT = 14,
-   
-    PICO_ERR_EBUSY = 16,
-    PICO_ERR_EEXIST = 17,
-   
-    PICO_ERR_EINVAL = 22,
-
-    PICO_ERR_ENONET = 64,
-
-    PICO_ERR_EPROTO = 71,
-
-    PICO_ERR_ENOPROTOOPT = 92,
-    PICO_ERR_EPROTONOSUPPORT = 93,
-
-    PICO_ERR_EOPNOTSUPP = 95,
-    PICO_ERR_EADDRINUSE = 98,
-    PICO_ERR_EADDRNOTAVAIL = 99,
-    PICO_ERR_ENETDOWN = 100,
-    PICO_ERR_ENETUNREACH = 101,
-
-    PICO_ERR_ECONNRESET = 104,
-
-    PICO_ERR_EISCONN = 106,
-    PICO_ERR_ENOTCONN = 107,
-    PICO_ERR_ESHUTDOWN = 108,
-
-    PICO_ERR_ETIMEDOUT = 110,
-    PICO_ERR_ECONNREFUSED = 111,
-    PICO_ERR_EHOSTDOWN = 112,
-    PICO_ERR_EHOSTUNREACH = 113,
-	}
-	return err_text;
-}
-*/

src/libzt.cpp

@@ -49,7 +49,7 @@
 
 // SDK
 #include "SocketTap.hpp"
-#include "ZeroTierSDK.h"
+#include "libzt.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -434,7 +434,7 @@ int zts_connect(ZT_CONNECT_SIG) {
     if(fd < 0) {
         errno = EBADF;
         DEBUG_ERROR("EBADF");
-        err = -1;
+        return -1;
     }
     if(!zt1Service) {
         DEBUG_ERROR("Service not started. Call zts_start(path) first");

src/picoTCP.cpp

@@ -38,7 +38,7 @@
 #include "pico_ipv6.h"
 
 // SDK
-#include "ZeroTierSDK.h"
+#include "libzt.h"
 #include "Utilities.hpp"
 #include "SocketTap.hpp"
 #include "picoTCP.hpp"
@@ -692,4 +692,55 @@ namespace ZeroTier {
     	}
     	return err;
     }
+
+	int beautify_pico_error(int err)
+	{
+		return 0;
+		/*
+		switch(err){
+			PICO_ERR_NOERR = 0,
+	    PICO_ERR_EPERM = 1,
+	    PICO_ERR_ENOENT = 2,
+	    
+	    PICO_ERR_EINTR = 4,
+	    PICO_ERR_EIO = 5,
+	    PICO_ERR_ENXIO = 6,
+	    
+	    PICO_ERR_EAGAIN = 11,
+	    PICO_ERR_ENOMEM = 12,
+	    PICO_ERR_EACCESS = 13,
+	    PICO_ERR_EFAULT = 14,
+	   
+	    PICO_ERR_EBUSY = 16,
+	    PICO_ERR_EEXIST = 17,
+	   
+	    PICO_ERR_EINVAL = 22,
+
+	    PICO_ERR_ENONET = 64,
+
+	    PICO_ERR_EPROTO = 71,
+
+	    PICO_ERR_ENOPROTOOPT = 92,
+	    PICO_ERR_EPROTONOSUPPORT = 93,
+
+	    PICO_ERR_EOPNOTSUPP = 95,
+	    PICO_ERR_EADDRINUSE = 98,
+	    PICO_ERR_EADDRNOTAVAIL = 99,
+	    PICO_ERR_ENETDOWN = 100,
+	    PICO_ERR_ENETUNREACH = 101,
+
+	    PICO_ERR_ECONNRESET = 104,
+
+	    PICO_ERR_EISCONN = 106,
+	    PICO_ERR_ENOTCONN = 107,
+	    PICO_ERR_ESHUTDOWN = 108,
+
+	    PICO_ERR_ETIMEDOUT = 110,
+	    PICO_ERR_ECONNREFUSED = 111,
+	    PICO_ERR_EHOSTDOWN = 112,
+	    PICO_ERR_EHOSTUNREACH = 113,
+		}
+		return err_text;
+		*/
+	}
 }

src/picoTCP.hpp

@@ -40,7 +40,7 @@
 #include "SocketTap.hpp"
 
 /****************************************************************************/
-/* PicoTCP API Signatures (See ZeroTierSDK.h for the API an app should use) */
+/* PicoTCP API Signatures (See libzt.h for the API an app should use) */
 /****************************************************************************/
 
 #define PICO_IPV4_TO_STRING_SIG char *ipbuf, const uint32_t ip