zerotier: removed

All vestiges of ZeroTier have been removed.  Also, as consequence,
some binary values have changed (specifically the number of the
address family used for NNG_AF_ABSTRACT.)

We may create a new ZeroTier transport that makes use of lwIP to
provide for ZeroTier and native host network coexistence, without
requiring ZeroTier to participate in the native networking stack.

2 files changed, 0 insertions, 28 deletions

diff --git a/src/core/sockaddr.c b/src/core/sockaddr.c
index d55db156..c7295083 100644
--- a/src/core/sockaddr.c
+++ b/src/core/sockaddr.c
@@ -133,15 +133,6 @@ str_sa_abstract(const nng_sockaddr_abstract *sa, char *buf, size_t bufsz)
 	return (buf);
 }
 
-static const char *
-str_sa_zt(const nng_sockaddr_zt *sa, char *buf, size_t bufsz)
-{
-	snprintf(buf, bufsz, "ZT[%llx:%llx:%u]",
-	    (unsigned long long) sa->sa_nodeid,
-	    (unsigned long long) sa->sa_nwid, sa->sa_port);
-	return (buf);
-}
-
 const char *
 nng_str_sockaddr(const nng_sockaddr *sa, char *buf, size_t bufsz)
 {
@@ -156,8 +147,6 @@ nng_str_sockaddr(const nng_sockaddr *sa, char *buf, size_t bufsz)
 		return (str_sa_ipc(&sa->s_ipc, buf, bufsz));
 	case NNG_AF_ABSTRACT:
 		return (str_sa_abstract(&sa->s_abstract, buf, bufsz));
-	case NNG_AF_ZT:
-		return (str_sa_zt(&sa->s_zt, buf, bufsz));
 	case NNG_AF_UNSPEC:
 	default:
 		return ("unknown");
@@ -175,8 +164,6 @@ nng_sockaddr_port(const nng_sockaddr *sa)
 	case NNG_AF_INET6:
 		NNI_GET16(&sa->s_in6.sa_port, port16);
 		return (port16);
-	case NNG_AF_ZT:
-		return (sa->s_zt.sa_port);
 	default:
 		return (0);
 	}
diff --git a/src/core/sockaddr_test.c b/src/core/sockaddr_test.c
index 0e05fc79..b40add28 100644
--- a/src/core/sockaddr_test.c
+++ b/src/core/sockaddr_test.c
@@ -147,20 +147,6 @@ test_sa_inet6_net(void)
 	NUTS_ASSERT(strcmp(addr, "[fc00::]:80") == 0);
 }
 
-void
-test_sa_zt(void)
-{
-	nng_sockaddr sa;
-	char         addr[NNG_MAXADDRSTRLEN];
-	sa.s_zt.sa_family = NNG_AF_ZT;
-	sa.s_zt.sa_nodeid = 0xa;
-	sa.s_zt.sa_nwid   = 0xb;
-	sa.s_zt.sa_port   = 1 << 20;
-	nng_str_sockaddr(&sa, addr, sizeof(addr));
-	nng_log_debug(NULL, "address is %s", addr);
-	NUTS_ASSERT(strcmp(addr, "ZT[a:b:1048576]") == 0);
-}
-
 TEST_LIST = {
 	{ "nng_sockaddr_ipc", test_sa_ipc },
 	{ "nng_sockaddr_abstract", test_sa_abstract },
@@ -171,6 +157,5 @@ TEST_LIST = {
 	{ "nng_sockaddr_in6 link local", test_sa_inet6_ll },
 	{ "nng_sockaddr_in6 zero", test_sa_inet6_zero },
 	{ "nng_sockaddr_in6 subnet", test_sa_inet6_net },
-	{ "nng_sockaddr_zt", test_sa_zt },
 	{ NULL, NULL },
 };