mirror
/
devilutionX-ZeroTierOne
mirror of https://github.com/diasurgical/ZeroTierOne.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Phy is a better name than Wire, and other cleanup.

pull/1/head
Adam Ierymenko 11 years ago
parent
fe87c1db67
commit
fe94c9460b
4 changed files with 208 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      include/ZeroTierOne.h
  2. 1
      node/Network.cpp
  3. 274
      osnet/Phy.hpp
  4. 138
      selftest.cpp

4
include/ZeroTierOne.h
Unescape View File

@ -338,14 +338,14 @@ typedef void (*ZT1_StatusCallback)(enum ZT1_StatusCode,const char *,const void *
* *
* @param node Result parameter: pointer to set to new node instance * @param node Result parameter: pointer to set to new node instance
* @param homePath ZeroTier home path for storing state information * @param homePath ZeroTier home path for storing state information
* @param lanConfigUpdateCallback Function to be called when virtual LANs are created, deleted, or their config parameters change * @param portConfigCallback Function to be called when virtual LANs are created, deleted, or their config parameters change
* @param statusCallback Function to receive status updates and non-fatal error notices * @param statusCallback Function to receive status updates and non-fatal error notices
* @return OK (0) or error code if a fatal error condition has occurred * @return OK (0) or error code if a fatal error condition has occurred
*/ */
enum ZT1_ReturnValue ZT1_Node_new( enum ZT1_ReturnValue ZT1_Node_new(
ZT1_Node **node, ZT1_Node **node,
const char *homePath, const char *homePath,
ZT1_VirtualLanConfigCallback *lanConfigUpdateCallback, ZT1_VirtualPortConfigCallback *portConfigCallback,
ZT1_StatusCallback *statusCallback); ZT1_StatusCallback *statusCallback);
/** /**

1
node/Network.cpp
Unescape View File

@ -39,7 +39,6 @@
#include "Buffer.hpp" #include "Buffer.hpp"
#include "EthernetTap.hpp" #include "EthernetTap.hpp"
#include "EthernetTapFactory.hpp" #include "EthernetTapFactory.hpp"
#include "RoutingTable.hpp"
#define ZT_NETWORK_CERT_WRITE_BUF_SIZE 131072 #define ZT_NETWORK_CERT_WRITE_BUF_SIZE 131072

274
osnet/Wire.hpp → osnet/Phy.hpp
Unescape View File

@ -25,8 +25,8 @@
* LLC. Start here: http://www.zerotier.com/ * LLC. Start here: http://www.zerotier.com/
*/ */
#ifndef ZT_WIRE_HPP #ifndef ZT_PHY_HPP
#define ZT_WIRE_HPP #define ZT_PHY_HPP
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -40,12 +40,12 @@
#include <WS2tcpip.h> #include <WS2tcpip.h>
#include <Windows.h> #include <Windows.h>
#define ZT_WIRE_SOCKFD_TYPE SOCKET #define ZT_PHY_SOCKFD_TYPE SOCKET
#define ZT_WIRE_SOCKFD_NULL (INVALID_SOCKET) #define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET)
#define ZT_WIRE_SOCKFD_VALID(s) ((s) != INVALID_SOCKET) #define ZT_PHY_SOCKFD_VALID(s) ((s) != INVALID_SOCKET)
#define ZT_WIRE_CLOSE_SOCKET(s) ::closesocket(s) #define ZT_PHY_CLOSE_SOCKET(s) ::closesocket(s)
#define ZT_WIRE_MAX_SOCKETS (FD_SETSIZE) #define ZT_PHY_MAX_SOCKETS (FD_SETSIZE)
#define ZT_WIRE_SOCKADDR_STORAGE_TYPE struct sockaddr_storage #define ZT_PHY_SOCKADDR_STORAGE_TYPE struct sockaddr_storage
#else // not Windows #else // not Windows
@ -61,12 +61,12 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#define ZT_WIRE_SOCKFD_TYPE int #define ZT_PHY_SOCKFD_TYPE int
#define ZT_WIRE_SOCKFD_NULL (-1) #define ZT_PHY_SOCKFD_NULL (-1)
#define ZT_WIRE_SOCKFD_VALID(s) ((s) > -1) #define ZT_PHY_SOCKFD_VALID(s) ((s) > -1)
#define ZT_WIRE_CLOSE_SOCKET(s) ::close(s) #define ZT_PHY_CLOSE_SOCKET(s) ::close(s)
#define ZT_WIRE_MAX_SOCKETS (FD_SETSIZE) #define ZT_PHY_MAX_SOCKETS (FD_SETSIZE)
#define ZT_WIRE_SOCKADDR_STORAGE_TYPE struct sockaddr_storage #define ZT_PHY_SOCKADDR_STORAGE_TYPE struct sockaddr_storage
#endif // Windows or not #endif // Windows or not
@ -75,23 +75,23 @@ namespace ZeroTier {
/** /**
* Opaque socket type * Opaque socket type
*/ */
typedef const void * WireSocket; typedef void PhySocket;
/** /**
* Simple templated non-blocking sockets implementation * Simple templated non-blocking sockets implementation
* *
* Yes there is boost::asio and libuv, but I like small binaries and I hate * Yes there is boost::asio and libuv, but I like small binaries and I hate
* build dependencies. * build dependencies. Both drag in a whole bunch of pasta with them.
* *
* This implementation takes four functions or function objects as template * This implementation takes four functions or function objects as template
* paramters: * paramters:
* *
* ON_DATAGRAM_FUNCTION(WireSocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) * ON_DATAGRAM_FUNCTION(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len)
* ON_TCP_CONNECT_FUNCTION(WireSocket *sock,void **uptr,bool success) * ON_TCP_CONNECT_FUNCTION(PhySocket *sock,void **uptr,bool success)
* ON_TCP_ACCEPT_FUNCTION(WireSocket *sockL,WireSocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from) * ON_TCP_ACCEPT_FUNCTION(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
* ON_TCP_CLOSE_FUNCTION(WireSocket *sock,void **uptr) * ON_TCP_CLOSE_FUNCTION(PhySocket *sock,void **uptr)
* ON_TCP_DATA_FUNCTION(WireSocket *sock,void **uptr,void *data,unsigned long len) * ON_TCP_DATA_FUNCTION(PhySocket *sock,void **uptr,void *data,unsigned long len)
* ON_TCP_WRITABLE_FUNCTION(WireSocket *sock,void **uptr) * ON_TCP_WRITABLE_FUNCTION(PhySocket *sock,void **uptr)
* *
* These templates typically refer to function objects. Templates are used to * These templates typically refer to function objects. Templates are used to
* avoid the call overhead of indirection, which is surprisingly high for high * avoid the call overhead of indirection, which is surprisingly high for high
@ -120,8 +120,8 @@ template <
typename ON_TCP_ACCEPT_FUNCTION, typename ON_TCP_ACCEPT_FUNCTION,
typename ON_TCP_CLOSE_FUNCTION, typename ON_TCP_CLOSE_FUNCTION,
typename ON_TCP_DATA_FUNCTION, typename ON_TCP_DATA_FUNCTION,
typename ON_TCP_WRITABLE_FUNCTION> typename ON_TCP_WRITABLE_FUNCTION >
class Wire class Phy
{ {
private: private:
ON_DATAGRAM_FUNCTION _datagramHandler; ON_DATAGRAM_FUNCTION _datagramHandler;
@ -131,25 +131,25 @@ private:
ON_TCP_DATA_FUNCTION _tcpDataHandler; ON_TCP_DATA_FUNCTION _tcpDataHandler;
ON_TCP_WRITABLE_FUNCTION _tcpWritableHandler; ON_TCP_WRITABLE_FUNCTION _tcpWritableHandler;
enum WireSocketType enum PhySocketType
{ {
ZT_WIRE_SOCKET_TCP_OUT_PENDING = 0x00, ZT_PHY_SOCKET_TCP_OUT_PENDING = 0x00,
ZT_WIRE_SOCKET_TCP_OUT_CONNECTED = 0x01, ZT_PHY_SOCKET_TCP_OUT_CONNECTED = 0x01,
ZT_WIRE_SOCKET_TCP_IN = 0x02, ZT_PHY_SOCKET_TCP_IN = 0x02,
ZT_WIRE_SOCKET_TCP_LISTEN = 0x03, ZT_PHY_SOCKET_TCP_LISTEN = 0x03,
ZT_WIRE_SOCKET_RAW = 0x04, ZT_PHY_SOCKET_RAW = 0x04,
ZT_WIRE_SOCKET_UDP = 0x05 ZT_PHY_SOCKET_UDP = 0x05
}; };
struct WireSocketImpl struct PhySocketImpl
{ {
WireSocketType type; PhySocketType type;
ZT_WIRE_SOCKFD_TYPE sock; ZT_PHY_SOCKFD_TYPE sock;
void *uptr; // user-settable pointer void *uptr; // user-settable pointer
ZT_WIRE_SOCKADDR_STORAGE_TYPE saddr; // remote for TCP_OUT and TCP_IN, local for TCP_LISTEN, RAW, and UDP ZT_PHY_SOCKADDR_STORAGE_TYPE saddr; // remote for TCP_OUT and TCP_IN, local for TCP_LISTEN, RAW, and UDP
}; };
std::list<WireSocketImpl> _socks; std::list<PhySocketImpl> _socks;
fd_set _readfds; fd_set _readfds;
fd_set _writefds; fd_set _writefds;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@ -157,8 +157,8 @@ private:
#endif #endif
long _nfds; long _nfds;
ZT_WIRE_SOCKFD_TYPE _whackReceiveSocket; ZT_PHY_SOCKFD_TYPE _whackReceiveSocket;
ZT_WIRE_SOCKFD_TYPE _whackSendSocket; ZT_PHY_SOCKFD_TYPE _whackSendSocket;
bool _noDelay; bool _noDelay;
@ -171,7 +171,7 @@ public:
* @param tcpWritableHandler Handler to be called when TCP sockets are writable (if notification is on) * @param tcpWritableHandler Handler to be called when TCP sockets are writable (if notification is on)
* @param noDelay If true, disable Nagle algorithm on new TCP sockets * @param noDelay If true, disable Nagle algorithm on new TCP sockets
*/ */
Wire( Phy(
ON_DATAGRAM_FUNCTION datagramHandler, ON_DATAGRAM_FUNCTION datagramHandler,
ON_TCP_CONNECT_FUNCTION tcpConnectHandler, ON_TCP_CONNECT_FUNCTION tcpConnectHandler,
ON_TCP_ACCEPT_FUNCTION tcpAcceptHandler, ON_TCP_ACCEPT_FUNCTION tcpAcceptHandler,
@ -230,12 +230,12 @@ public:
_noDelay = noDelay; _noDelay = noDelay;
} }
~Wire() ~Phy()
{ {
while (!_socks.empty()) while (!_socks.empty())
this->close((WireSocket *)&(_socks.front()),true); this->close((PhySocket *)&(_socks.front()),true);
ZT_WIRE_CLOSE_SOCKET(_whackReceiveSocket); ZT_PHY_CLOSE_SOCKET(_whackReceiveSocket);
ZT_WIRE_CLOSE_SOCKET(_whackSendSocket); ZT_PHY_CLOSE_SOCKET(_whackSendSocket);
} }
/** /**
@ -246,7 +246,7 @@ public:
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
::send(_whackSendSocket,(const char *)this,1,0); ::send(_whackSendSocket,(const char *)this,1,0);
#else #else
::write(_whackSendSocket,(WireSocket *)this,1); ::write(_whackSendSocket,(PhySocket *)this,1);
#endif #endif
} }
@ -258,7 +258,7 @@ public:
/** /**
* @return Maximum number of sockets allowed * @return Maximum number of sockets allowed
*/ */
inline unsigned long maxCount() const throw() { return ZT_WIRE_MAX_SOCKETS; } inline unsigned long maxCount() const throw() { return ZT_PHY_MAX_SOCKETS; }
/** /**
* Bind a UDP socket * Bind a UDP socket
@ -268,14 +268,14 @@ public:
* @param bufferSize Desired socket receive/send buffer size -- will set as close to this as possible (default: 0, leave alone) * @param bufferSize Desired socket receive/send buffer size -- will set as close to this as possible (default: 0, leave alone)
* @return Socket or NULL on failure to bind * @return Socket or NULL on failure to bind
*/ */
inline WireSocket *udpBind(const struct sockaddr *localAddress,void *uptr = (void *)0,int bufferSize = 0) inline PhySocket *udpBind(const struct sockaddr *localAddress,void *uptr = (void *)0,int bufferSize = 0)
{ {
if (_socks.size() >= ZT_WIRE_MAX_SOCKETS) if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
return (WireSocket *)0; return (PhySocket *)0;
ZT_WIRE_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_DGRAM,0); ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_DGRAM,0);
if (!ZT_WIRE_SOCKFD_VALID(s)) if (!ZT_PHY_SOCKFD_VALID(s))
return (WireSocket *)0; return (PhySocket *)0;
if (bufferSize > 0) { if (bufferSize > 0) {
int bs = bufferSize; int bs = bufferSize;
@ -325,8 +325,8 @@ public:
#endif // Windows or not #endif // Windows or not
if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) { if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@ -336,23 +336,23 @@ public:
#endif #endif
try { try {
_socks.push_back(WireSocketImpl()); _socks.push_back(PhySocketImpl());
} catch ( ... ) { } catch ( ... ) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
WireSocketImpl &sws = _socks.back(); PhySocketImpl &sws = _socks.back();
if ((long)s > _nfds) if ((long)s > _nfds)
_nfds = (long)s; _nfds = (long)s;
FD_SET(s,&_readfds); FD_SET(s,&_readfds);
sws.type = ZT_WIRE_SOCKET_UDP; sws.type = ZT_PHY_SOCKET_UDP;
sws.sock = s; sws.sock = s;
sws.uptr = uptr; sws.uptr = uptr;
memset(&(sws.saddr),0,sizeof(struct sockaddr_storage)); memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)); memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
return (WireSocket *)&sws; return (PhySocket *)&sws;
} }
/** /**
@ -364,9 +364,9 @@ public:
* @param len Length of packet * @param len Length of packet
* @return True if packet appears to have been sent successfully * @return True if packet appears to have been sent successfully
*/ */
inline bool udpSend(WireSocket *sock,const struct sockaddr *remoteAddress,const void *data,unsigned long len) inline bool udpSend(PhySocket *sock,const struct sockaddr *remoteAddress,const void *data,unsigned long len)
{ {
WireSocketImpl &sws = *(const_cast <WireSocketImpl *>(reinterpret_cast<const WireSocketImpl *>(sock))); PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
return ((long)::sendto(sws.sock,data,len,0,remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len); return ((long)::sendto(sws.sock,data,len,0,remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len);
} }
@ -377,14 +377,14 @@ public:
* @param uptr Initial value of uptr for new socket (default: NULL) * @param uptr Initial value of uptr for new socket (default: NULL)
* @return Socket or NULL on failure to bind * @return Socket or NULL on failure to bind
*/ */
inline WireSocket *tcpListen(const struct sockaddr *localAddress,void *uptr = (void *)0) inline PhySocket *tcpListen(const struct sockaddr *localAddress,void *uptr = (void *)0)
{ {
if (_socks.size() >= ZT_WIRE_MAX_SOCKETS) if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
return (WireSocket *)0; return (PhySocket *)0;
ZT_WIRE_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_STREAM,0); ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_STREAM,0);
if (!ZT_WIRE_SOCKFD_VALID(s)) if (!ZT_PHY_SOCKFD_VALID(s))
return (WireSocket *)0; return (PhySocket *)0;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
{ {
@ -406,33 +406,33 @@ public:
#endif #endif
if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) { if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
if (::listen(s,1024)) { if (::listen(s,1024)) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
try { try {
_socks.push_back(WireSocketImpl()); _socks.push_back(PhySocketImpl());
} catch ( ... ) { } catch ( ... ) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
WireSocketImpl &sws = _socks.back(); PhySocketImpl &sws = _socks.back();
if ((long)s > _nfds) if ((long)s > _nfds)
_nfds = (long)s; _nfds = (long)s;
FD_SET(s,&_readfds); FD_SET(s,&_readfds);
sws.type = ZT_WIRE_SOCKET_TCP_LISTEN; sws.type = ZT_PHY_SOCKET_TCP_LISTEN;
sws.sock = s; sws.sock = s;
sws.uptr = uptr; sws.uptr = uptr;
memset(&(sws.saddr),0,sizeof(struct sockaddr_storage)); memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)); memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
return (WireSocket *)&sws; return (PhySocket *)&sws;
} }
/** /**
@ -457,15 +457,15 @@ public:
* @param callConnectHandler If true, call TCP connect handler even if result is known before function exit (default: true) * @param callConnectHandler If true, call TCP connect handler even if result is known before function exit (default: true)
* @return New socket or NULL on failure * @return New socket or NULL on failure
*/ */
inline WireSocket *tcpConnect(const struct sockaddr *remoteAddress,bool &connected,void *uptr = (void *)0,bool callConnectHandler = true) inline PhySocket *tcpConnect(const struct sockaddr *remoteAddress,bool &connected,void *uptr = (void *)0,bool callConnectHandler = true)
{ {
if (_socks.size() >= ZT_WIRE_MAX_SOCKETS) if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
return (WireSocket *)0; return (PhySocket *)0;
ZT_WIRE_SOCKFD_TYPE s = ::socket(remoteAddress->sa_family,SOCK_STREAM,0); ZT_PHY_SOCKFD_TYPE s = ::socket(remoteAddress->sa_family,SOCK_STREAM,0);
if (!ZT_WIRE_SOCKFD_VALID(s)) { if (!ZT_PHY_SOCKFD_VALID(s)) {
connected = false; connected = false;
return (WireSocket *)0; return (PhySocket *)0;
} }
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@ -495,30 +495,30 @@ public:
#else #else
if (errno != EINPROGRESS) { if (errno != EINPROGRESS) {
#endif #endif
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} // else connection is proceeding asynchronously... } // else connection is proceeding asynchronously...
} }
try { try {
_socks.push_back(WireSocketImpl()); _socks.push_back(PhySocketImpl());
} catch ( ... ) { } catch ( ... ) {
ZT_WIRE_CLOSE_SOCKET(s); ZT_PHY_CLOSE_SOCKET(s);
return (WireSocket *)0; return (PhySocket *)0;
} }
WireSocketImpl &sws = _socks.back(); PhySocketImpl &sws = _socks.back();
if ((long)s > _nfds) if ((long)s > _nfds)
_nfds = (long)s; _nfds = (long)s;
if (connected) { if (connected) {
FD_SET(s,&_readfds); FD_SET(s,&_readfds);
sws.type = ZT_WIRE_SOCKET_TCP_OUT_CONNECTED; sws.type = ZT_PHY_SOCKET_TCP_OUT_CONNECTED;
} else { } else {
FD_SET(s,&_writefds); FD_SET(s,&_writefds);
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
FD_SET(s,&_exceptfds); FD_SET(s,&_exceptfds);
#endif #endif
sws.type = ZT_WIRE_SOCKET_TCP_OUT_PENDING; sws.type = ZT_PHY_SOCKET_TCP_OUT_PENDING;
} }
sws.sock = s; sws.sock = s;
sws.uptr = uptr; sws.uptr = uptr;
@ -527,11 +527,11 @@ public:
if ((callConnectHandler)&&(connected)) { if ((callConnectHandler)&&(connected)) {
try { try {
_tcpConnectHandler((WireSocket *)&sws,&(sws.uptr),true); _tcpConnectHandler((PhySocket *)&sws,&(sws.uptr),true);
} catch ( ... ) {} } catch ( ... ) {}
} }
return (WireSocket *)&sws; return (PhySocket *)&sws;
} }
/** /**
@ -547,9 +547,9 @@ public:
* @param callCloseHandler If true, call close handler on socket closing failure condition * @param callCloseHandler If true, call close handler on socket closing failure condition
* @return Number of bytes actually sent or -1 on fatal error (socket closure) * @return Number of bytes actually sent or -1 on fatal error (socket closure)
*/ */
inline long tcpSend(WireSocket *sock,const void *data,unsigned long len,bool callCloseHandler) inline long tcpSend(PhySocket *sock,const void *data,unsigned long len,bool callCloseHandler)
{ {
WireSocketImpl &sws = *(const_cast <WireSocketImpl *>(reinterpret_cast<const WireSocketImpl *>(sock))); PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
long n = (long)::send(sws.sock,data,len,0); long n = (long)::send(sws.sock,data,len,0);
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if (n == SOCKET_ERROR) { if (n == SOCKET_ERROR) {
@ -594,9 +594,9 @@ public:
* @param sock TCP connection socket (other types are not valid) * @param sock TCP connection socket (other types are not valid)
* @param notifyWritable Want writable notifications? * @param notifyWritable Want writable notifications?
*/ */
inline const void tcpSetNotifyWritable(WireSocket *sock,bool notifyWritable) inline const void tcpSetNotifyWritable(PhySocket *sock,bool notifyWritable)
{ {
WireSocketImpl &sws = *(const_cast <WireSocketImpl *>(reinterpret_cast<const WireSocketImpl *>(sock))); PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
if (notifyWritable) { if (notifyWritable) {
FD_SET(sws.sock,&_writefds); FD_SET(sws.sock,&_writefds);
} else { } else {
@ -642,62 +642,62 @@ public:
#endif #endif
} }
for(typename std::list<WireSocketImpl>::iterator s(_socks.begin()),nexts;s!=_socks.end();s=nexts) { for(typename std::list<PhySocketImpl>::iterator s(_socks.begin()),nexts;s!=_socks.end();s=nexts) {
nexts = s; ++nexts; // we can delete the linked list item, so traverse now nexts = s; ++nexts; // we can delete the linked list item, so traverse now
switch (s->type) { switch (s->type) {
case ZT_WIRE_SOCKET_TCP_OUT_PENDING: case ZT_PHY_SOCKET_TCP_OUT_PENDING:
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if (FD_ISSET(s->sock,&efds)) if (FD_ISSET(s->sock,&efds))
this->close((WireSocket *)&(*s),true); this->close((PhySocket *)&(*s),true);
else // ... if else // ... if
#endif #endif
if (FD_ISSET(s->sock,&wfds)) { if (FD_ISSET(s->sock,&wfds)) {
socklen_t slen = sizeof(ss); socklen_t slen = sizeof(ss);
if (::getpeername(s->sock,(struct sockaddr *)&ss,&slen) != 0) { if (::getpeername(s->sock,(struct sockaddr *)&ss,&slen) != 0) {
this->close((WireSocket *)&(*s),true); this->close((PhySocket *)&(*s),true);
} else { } else {
s->type = ZT_WIRE_SOCKET_TCP_OUT_CONNECTED; s->type = ZT_PHY_SOCKET_TCP_OUT_CONNECTED;
FD_SET(s->sock,&_readfds); FD_SET(s->sock,&_readfds);
FD_CLR(s->sock,&_writefds); FD_CLR(s->sock,&_writefds);
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
FD_CLR(s->sock,&_exceptfds); FD_CLR(s->sock,&_exceptfds);
#endif #endif
try { try {
_tcpConnectHandler((WireSocket *)&(*s),&(s->uptr),true); _tcpConnectHandler((PhySocket *)&(*s),&(s->uptr),true);
} catch ( ... ) {} } catch ( ... ) {}
} }
} }
break; break;
case ZT_WIRE_SOCKET_TCP_OUT_CONNECTED: case ZT_PHY_SOCKET_TCP_OUT_CONNECTED:
case ZT_WIRE_SOCKET_TCP_IN: case ZT_PHY_SOCKET_TCP_IN:
if (FD_ISSET(s->sock,&rfds)) { if (FD_ISSET(s->sock,&rfds)) {
long n = (long)::recv(s->sock,buf,sizeof(buf),0); long n = (long)::recv(s->sock,buf,sizeof(buf),0);
if (n <= 0) { if (n <= 0) {
this->close((WireSocket *)&(*s),true); this->close((PhySocket *)&(*s),true);
} else { } else {
try { try {
_tcpDataHandler((WireSocket *)&(*s),&(s->uptr),(void *)buf,(unsigned long)n); _tcpDataHandler((PhySocket *)&(*s),&(s->uptr),(void *)buf,(unsigned long)n);
} catch ( ... ) {} } catch ( ... ) {}
} }
} }
if ((FD_ISSET(s->sock,&wfds))&&(FD_ISSET(s->sock,&_writefds))) { if ((FD_ISSET(s->sock,&wfds))&&(FD_ISSET(s->sock,&_writefds))) {
try { try {
_tcpWritableHandler((WireSocket *)&(*s),&(s->uptr)); _tcpWritableHandler((PhySocket *)&(*s),&(s->uptr));
} catch ( ... ) {} } catch ( ... ) {}
} }
break; break;
case ZT_WIRE_SOCKET_TCP_LISTEN: case ZT_PHY_SOCKET_TCP_LISTEN:
if (FD_ISSET(s->sock,&rfds)) { if (FD_ISSET(s->sock,&rfds)) {
memset(&ss,0,sizeof(ss)); memset(&ss,0,sizeof(ss));
socklen_t slen = sizeof(ss); socklen_t slen = sizeof(ss);
ZT_WIRE_SOCKFD_TYPE newSock = ::accept(s->sock,(struct sockaddr *)&ss,&slen); ZT_PHY_SOCKFD_TYPE newSock = ::accept(s->sock,(struct sockaddr *)&ss,&slen);
if (ZT_WIRE_SOCKFD_VALID(newSock)) { if (ZT_PHY_SOCKFD_VALID(newSock)) {
if (_socks.size() >= ZT_WIRE_MAX_SOCKETS) { if (_socks.size() >= ZT_PHY_MAX_SOCKETS) {
ZT_WIRE_CLOSE_SOCKET(newSock); ZT_PHY_CLOSE_SOCKET(newSock);
} else { } else {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
{ BOOL f = (_noDelay ? TRUE : FALSE); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); } { BOOL f = (_noDelay ? TRUE : FALSE); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); }
@ -706,31 +706,31 @@ public:
{ int f = (_noDelay ? 1 : 0); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); } { int f = (_noDelay ? 1 : 0); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); }
fcntl(newSock,F_SETFL,O_NONBLOCK); fcntl(newSock,F_SETFL,O_NONBLOCK);
#endif #endif
_socks.push_back(WireSocketImpl()); _socks.push_back(PhySocketImpl());
WireSocketImpl &sws = _socks.back(); PhySocketImpl &sws = _socks.back();
FD_SET(newSock,&_readfds); FD_SET(newSock,&_readfds);
if ((long)newSock > _nfds) if ((long)newSock > _nfds)
_nfds = (long)newSock; _nfds = (long)newSock;
sws.type = ZT_WIRE_SOCKET_TCP_IN; sws.type = ZT_PHY_SOCKET_TCP_IN;
sws.sock = newSock; sws.sock = newSock;
sws.uptr = (void *)0; sws.uptr = (void *)0;
memcpy(&(sws.saddr),&ss,sizeof(struct sockaddr_storage)); memcpy(&(sws.saddr),&ss,sizeof(struct sockaddr_storage));
try { try {
_tcpAcceptHandler((WireSocket *)&(*s),(WireSocket *)&(_socks.back()),&(s->uptr),&(sws.uptr),(const struct sockaddr *)&(sws.saddr)); _tcpAcceptHandler((PhySocket *)&(*s),(PhySocket *)&(_socks.back()),&(s->uptr),&(sws.uptr),(const struct sockaddr *)&(sws.saddr));
} catch ( ... ) {} } catch ( ... ) {}
} }
} }
} }
break; break;
case ZT_WIRE_SOCKET_UDP: case ZT_PHY_SOCKET_UDP:
if (FD_ISSET(s->sock,&rfds)) { if (FD_ISSET(s->sock,&rfds)) {
memset(&ss,0,sizeof(ss)); memset(&ss,0,sizeof(ss));
socklen_t slen = sizeof(ss); socklen_t slen = sizeof(ss);
long n = (long)::recvfrom(s->sock,buf,sizeof(buf),0,(struct sockaddr *)&ss,&slen); long n = (long)::recvfrom(s->sock,buf,sizeof(buf),0,(struct sockaddr *)&ss,&slen);
if (n > 0) { if (n > 0) {
try { try {
_datagramHandler((WireSocket *)&(*s),&(s->uptr),(const struct sockaddr *)&ss,(void *)buf,(unsigned long)n); _datagramHandler((PhySocket *)&(*s),&(s->uptr),(const struct sockaddr *)&ss,(void *)buf,(unsigned long)n);
} catch ( ... ) {} } catch ( ... ) {}
} }
} }
@ -743,11 +743,11 @@ public:
} }
} }
inline void close(WireSocket *sock,bool callHandlers) inline void close(PhySocket *sock,bool callHandlers)
{ {
if (!sock) if (!sock)
return; return;
WireSocketImpl &sws = *(const_cast <WireSocketImpl *>(reinterpret_cast<const WireSocketImpl *>(sock))); PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
FD_CLR(sws.sock,&_readfds); FD_CLR(sws.sock,&_readfds);
FD_CLR(sws.sock,&_writefds); FD_CLR(sws.sock,&_writefds);
@ -755,18 +755,18 @@ public:
FD_CLR(sws.sock,&_exceptfds); FD_CLR(sws.sock,&_exceptfds);
#endif #endif
ZT_WIRE_CLOSE_SOCKET(sws.sock); ZT_PHY_CLOSE_SOCKET(sws.sock);
switch(sws.type) { switch(sws.type) {
case ZT_WIRE_SOCKET_TCP_OUT_PENDING: case ZT_PHY_SOCKET_TCP_OUT_PENDING:
if (callHandlers) { if (callHandlers) {
try { try {
_tcpConnectHandler(sock,&(sws.uptr),false); _tcpConnectHandler(sock,&(sws.uptr),false);
} catch ( ... ) {} } catch ( ... ) {}
} }
break; break;
case ZT_WIRE_SOCKET_TCP_OUT_CONNECTED: case ZT_PHY_SOCKET_TCP_OUT_CONNECTED:
case ZT_WIRE_SOCKET_TCP_IN: case ZT_PHY_SOCKET_TCP_IN:
if (callHandlers) { if (callHandlers) {
try { try {
_tcpCloseHandler(sock,&(sws.uptr)); _tcpCloseHandler(sock,&(sws.uptr));
@ -779,8 +779,8 @@ public:
long oldSock = (long)sws.sock; long oldSock = (long)sws.sock;
for(typename std::list<WireSocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) { for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) {
if (reinterpret_cast<WireSocket *>(&(*s)) == sock) { if (reinterpret_cast<PhySocket *>(&(*s)) == sock) {
_socks.erase(s); _socks.erase(s);
break; break;
} }
@ -790,7 +790,7 @@ public:
long nfds = (long)_whackSendSocket; long nfds = (long)_whackSendSocket;
if ((long)_whackReceiveSocket > nfds) if ((long)_whackReceiveSocket > nfds)
nfds = (long)_whackReceiveSocket; nfds = (long)_whackReceiveSocket;
for(typename std::list<WireSocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) { for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) {
if ((long)s->sock > nfds) if ((long)s->sock > nfds)
nfds = (long)s->sock; nfds = (long)s->sock;
} }
@ -799,18 +799,18 @@ public:
} }
}; };
// Typedefs for using regular naked functions as template parameters to Wire<> // Typedefs for using regular naked functions as template parameters to Phy<>
typedef void (*Wire_OnDatagramFunctionPtr)(WireSocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len); typedef void (*Phy_OnDatagramFunctionPtr)(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len);
typedef void (*Wire_OnTcpConnectFunction)(WireSocket *sock,void **uptr,bool success); typedef void (*Phy_OnTcpConnectFunction)(PhySocket *sock,void **uptr,bool success);
typedef void (*Wire_OnTcpAcceptFunction)(WireSocket *sockL,WireSocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from); typedef void (*Phy_OnTcpAcceptFunction)(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from);
typedef void (*Wire_OnTcpCloseFunction)(WireSocket *sock,void **uptr); typedef void (*Phy_OnTcpCloseFunction)(PhySocket *sock,void **uptr);
typedef void (*Wire_OnTcpDataFunction)(WireSocket *sock,void **uptr,void *data,unsigned long len); typedef void (*Phy_OnTcpDataFunction)(PhySocket *sock,void **uptr,void *data,unsigned long len);
typedef void (*Wire_OnTcpWritableFunction)(WireSocket *sock,void **uptr); typedef void (*Phy_OnTcpWritableFunction)(PhySocket *sock,void **uptr);
/** /**
* Wire<> typedef'd to use simple naked function pointers * Phy<> typedef'd to use simple naked function pointers
*/ */
typedef Wire<Wire_OnDatagramFunctionPtr,Wire_OnTcpConnectFunction,Wire_OnTcpAcceptFunction,Wire_OnTcpCloseFunction,Wire_OnTcpDataFunction,Wire_OnTcpWritableFunction> SimpleFunctionWire; typedef Phy<Phy_OnDatagramFunctionPtr,Phy_OnTcpConnectFunction,Phy_OnTcpAcceptFunction,Phy_OnTcpCloseFunction,Phy_OnTcpDataFunction,Phy_OnTcpWritableFunction> SimpleFunctionPhy;
} // namespace ZeroTier } // namespace ZeroTier

138
selftest.cpp
Unescape View File

@ -25,7 +25,7 @@
* LLC. Start here: http://www.zerotier.com/ * LLC. Start here: http://www.zerotier.com/
*/ */
#define ZT_TEST_WIRE #define ZT_TEST_PHY
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -57,8 +57,8 @@
#include "node/Defaults.hpp" #include "node/Defaults.hpp"
#include "node/Node.hpp" #include "node/Node.hpp"
#ifdef ZT_TEST_WIRE #ifdef ZT_TEST_PHY
#include "osnet/Wire.hpp" #include "osnet/Phy.hpp"
#endif #endif
#ifdef ZT_ENABLE_NETCONF_MASTER #ifdef ZT_ENABLE_NETCONF_MASTER
@ -646,63 +646,63 @@ static int testOther()
return 0; return 0;
} }
#ifdef ZT_TEST_WIRE #ifdef ZT_TEST_PHY
#define ZT_TEST_WIRE_NUM_UDP_PACKETS 10000 #define ZT_TEST_PHY_NUM_UDP_PACKETS 10000
#define ZT_TEST_WIRE_UDP_PACKET_SIZE 1000 #define ZT_TEST_PHY_UDP_PACKET_SIZE 1000
#define ZT_TEST_WIRE_NUM_VALID_TCP_CONNECTS 10 #define ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS 10
#define ZT_TEST_WIRE_NUM_INVALID_TCP_CONNECTS 2 #define ZT_TEST_PHY_NUM_INVALID_TCP_CONNECTS 2
#define ZT_TEST_WIRE_TCP_MESSAGE_SIZE 1000000 #define ZT_TEST_PHY_TCP_MESSAGE_SIZE 1000000
#define ZT_TEST_WIRE_TIMEOUT_MS 20000 #define ZT_TEST_PHY_TIMEOUT_MS 20000
static unsigned long wireTestUdpPacketCount = 0; static unsigned long phyTestUdpPacketCount = 0;
static unsigned long wireTestTcpByteCount = 0; static unsigned long phyTestTcpByteCount = 0;
static unsigned long wireTestTcpConnectSuccessCount = 0; static unsigned long phyTestTcpConnectSuccessCount = 0;
static unsigned long wireTestTcpConnectFailCount = 0; static unsigned long phyTestTcpConnectFailCount = 0;
static unsigned long wireTestTcpAcceptCount = 0; static unsigned long phyTestTcpAcceptCount = 0;
static SimpleFunctionWire *testWireInstance = (SimpleFunctionWire *)0; static SimpleFunctionPhy *testPhyInstance = (SimpleFunctionPhy *)0;
static void testWireOnDatagramFunction(WireSocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) static void testPhyOnDatagramFunction(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len)
{ {
++wireTestUdpPacketCount; ++phyTestUdpPacketCount;
} }
static void testWireOnTcpConnectFunction(WireSocket *sock,void **uptr,bool success) static void testPhyOnTcpConnectFunction(PhySocket *sock,void **uptr,bool success)
{ {
if (success) { if (success) {
++wireTestTcpConnectSuccessCount; ++phyTestTcpConnectSuccessCount;
} else { } else {
++wireTestTcpConnectFailCount; ++phyTestTcpConnectFailCount;
} }
} }
static void testWireOnTcpAcceptFunction(WireSocket *sockL,WireSocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from) static void testPhyOnTcpAcceptFunction(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
{ {
++wireTestTcpAcceptCount; ++phyTestTcpAcceptCount;
*uptrN = new std::string(ZT_TEST_WIRE_TCP_MESSAGE_SIZE,(char)0xff); *uptrN = new std::string(ZT_TEST_PHY_TCP_MESSAGE_SIZE,(char)0xff);
testWireInstance->tcpSetNotifyWritable(sockN,true); testPhyInstance->tcpSetNotifyWritable(sockN,true);
} }
static void testWireOnTcpCloseFunction(WireSocket *sock,void **uptr) static void testPhyOnTcpCloseFunction(PhySocket *sock,void **uptr)
{ {
delete (std::string *)*uptr; // delete testMessage if any delete (std::string *)*uptr; // delete testMessage if any
} }
static void testWireOnTcpDataFunction(WireSocket *sock,void **uptr,void *data,unsigned long len) static void testPhyOnTcpDataFunction(PhySocket *sock,void **uptr,void *data,unsigned long len)
{ {
wireTestTcpByteCount += len; phyTestTcpByteCount += len;
} }
static void testWireOnTcpWritableFunction(WireSocket *sock,void **uptr) static void testPhyOnTcpWritableFunction(PhySocket *sock,void **uptr)
{ {
std::string *testMessage = (std::string *)*uptr; std::string *testMessage = (std::string *)*uptr;
if ((testMessage)&&(testMessage->length() > 0)) { if ((testMessage)&&(testMessage->length() > 0)) {
long sent = testWireInstance->tcpSend(sock,(const void *)testMessage->data(),testMessage->length(),true); long sent = testPhyInstance->tcpSend(sock,(const void *)testMessage->data(),testMessage->length(),true);
if (sent > 0) if (sent > 0)
testMessage->erase(0,sent); testMessage->erase(0,sent);
} }
if ((!testMessage)||(!testMessage->length())) { if ((!testMessage)||(!testMessage->length())) {
testWireInstance->close(sock,true); testPhyInstance->close(sock,true);
} }
} }
#endif // ZT_TEST_WIRE #endif // ZT_TEST_PHY
static int testWire() static int testPhy()
{ {
#ifdef ZT_TEST_WIRE #ifdef ZT_TEST_PHY
char udpTestPayload[ZT_TEST_WIRE_UDP_PACKET_SIZE]; char udpTestPayload[ZT_TEST_PHY_UDP_PACKET_SIZE];
memset(udpTestPayload,0xff,sizeof(udpTestPayload)); memset(udpTestPayload,0xff,sizeof(udpTestPayload));
struct sockaddr_in bindaddr; struct sockaddr_in bindaddr;
@ -716,66 +716,66 @@ static int testWire()
bindaddr.sin_port = Utils::hton((uint16_t)60004); bindaddr.sin_port = Utils::hton((uint16_t)60004);
bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001); bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001);
std::cout << "[wire] Creating wire endpoint..." << std::endl; std::cout << "[phy] Creating phy endpoint..." << std::endl;
testWireInstance = new SimpleFunctionWire(testWireOnDatagramFunction,testWireOnTcpConnectFunction,testWireOnTcpAcceptFunction,testWireOnTcpCloseFunction,testWireOnTcpDataFunction,testWireOnTcpWritableFunction,false); testPhyInstance = new SimpleFunctionPhy(testPhyOnDatagramFunction,testPhyOnTcpConnectFunction,testPhyOnTcpAcceptFunction,testPhyOnTcpCloseFunction,testPhyOnTcpDataFunction,testPhyOnTcpWritableFunction,false);
std::cout << "[wire] Binding UDP listen socket to 127.0.0.1/60002... "; std::cout << "[phy] Binding UDP listen socket to 127.0.0.1/60002... ";
WireSocket *udpListenSock = testWireInstance->udpBind((const struct sockaddr *)&bindaddr); PhySocket *udpListenSock = testPhyInstance->udpBind((const struct sockaddr *)&bindaddr);
if (!udpListenSock) { if (!udpListenSock) {
std::cout << "FAILED." << std::endl; std::cout << "FAILED." << std::endl;
return -1; return -1;
} }
std::cout << "OK" << std::endl; std::cout << "OK" << std::endl;
std::cout << "[wire] Binding TCP listen socket to 127.0.0.1/60002... "; std::cout << "[phy] Binding TCP listen socket to 127.0.0.1/60002... ";
WireSocket *tcpListenSock = testWireInstance->tcpListen((const struct sockaddr *)&bindaddr); PhySocket *tcpListenSock = testPhyInstance->tcpListen((const struct sockaddr *)&bindaddr);
if (!tcpListenSock) { if (!tcpListenSock) {
std::cout << "FAILED." << std::endl; std::cout << "FAILED." << std::endl;
return -1; return -1;
} }
std::cout << "OK" << std::endl; std::cout << "OK" << std::endl;
unsigned long wireTestUdpPacketsSent = 0; unsigned long phyTestUdpPacketsSent = 0;
unsigned long wireTestTcpValidConnectionsAttempted = 0; unsigned long phyTestTcpValidConnectionsAttempted = 0;
unsigned long wireTestTcpInvalidConnectionsAttempted = 0; unsigned long phyTestTcpInvalidConnectionsAttempted = 0;
std::cout << "[wire] Testing UDP send/receive... "; std::cout.flush(); std::cout << "[phy] Testing UDP send/receive... "; std::cout.flush();
uint64_t timeoutAt = Utils::now() + ZT_TEST_WIRE_TIMEOUT_MS; uint64_t timeoutAt = Utils::now() + ZT_TEST_PHY_TIMEOUT_MS;
while ((Utils::now() < timeoutAt)&&(wireTestUdpPacketCount < ZT_TEST_WIRE_NUM_UDP_PACKETS)) { while ((Utils::now() < timeoutAt)&&(phyTestUdpPacketCount < ZT_TEST_PHY_NUM_UDP_PACKETS)) {
if (wireTestUdpPacketsSent < ZT_TEST_WIRE_NUM_UDP_PACKETS) { if (phyTestUdpPacketsSent < ZT_TEST_PHY_NUM_UDP_PACKETS) {
if (!testWireInstance->udpSend(udpListenSock,(const struct sockaddr *)&bindaddr,udpTestPayload,sizeof(udpTestPayload))) { if (!testPhyInstance->udpSend(udpListenSock,(const struct sockaddr *)&bindaddr,udpTestPayload,sizeof(udpTestPayload))) {
std::cout << "FAILED." << std::endl; std::cout << "FAILED." << std::endl;
return -1; return -1;
} else ++wireTestUdpPacketsSent; } else ++phyTestUdpPacketsSent;
} }
testWireInstance->poll(100); testPhyInstance->poll(100);
} }
std::cout << "got " << wireTestUdpPacketCount << " packets, OK" << std::endl; std::cout << "got " << phyTestUdpPacketCount << " packets, OK" << std::endl;
std::cout << "[wire] Testing TCP... "; std::cout.flush(); std::cout << "[phy] Testing TCP... "; std::cout.flush();
timeoutAt = Utils::now() + ZT_TEST_WIRE_TIMEOUT_MS; timeoutAt = Utils::now() + ZT_TEST_PHY_TIMEOUT_MS;
while ((Utils::now() < timeoutAt)&&(wireTestTcpByteCount < (ZT_TEST_WIRE_NUM_VALID_TCP_CONNECTS * ZT_TEST_WIRE_TCP_MESSAGE_SIZE))) { while ((Utils::now() < timeoutAt)&&(phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE))) {
if (wireTestTcpValidConnectionsAttempted < ZT_TEST_WIRE_NUM_VALID_TCP_CONNECTS) { if (phyTestTcpValidConnectionsAttempted < ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS) {
++wireTestTcpValidConnectionsAttempted; ++phyTestTcpValidConnectionsAttempted;
bool connected = false; bool connected = false;
if (!testWireInstance->tcpConnect((const struct sockaddr *)&bindaddr,connected,(void *)0,true)) if (!testPhyInstance->tcpConnect((const struct sockaddr *)&bindaddr,connected,(void *)0,true))
++wireTestTcpConnectFailCount; ++phyTestTcpConnectFailCount;
} }
if (wireTestTcpInvalidConnectionsAttempted < ZT_TEST_WIRE_NUM_INVALID_TCP_CONNECTS) { if (phyTestTcpInvalidConnectionsAttempted < ZT_TEST_PHY_NUM_INVALID_TCP_CONNECTS) {
++wireTestTcpInvalidConnectionsAttempted; ++phyTestTcpInvalidConnectionsAttempted;
bool connected = false; bool connected = false;
if (!testWireInstance->tcpConnect((const struct sockaddr *)&invalidAddr,connected,(void *)0,true)) if (!testPhyInstance->tcpConnect((const struct sockaddr *)&invalidAddr,connected,(void *)0,true))
++wireTestTcpConnectFailCount; ++phyTestTcpConnectFailCount;
} }
testWireInstance->poll(100); testPhyInstance->poll(100);
} }
if (wireTestTcpByteCount < (ZT_TEST_WIRE_NUM_VALID_TCP_CONNECTS * ZT_TEST_WIRE_TCP_MESSAGE_SIZE)) { if (phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE)) {
std::cout << "got " << wireTestTcpConnectSuccessCount << " connect successes, " << wireTestTcpConnectFailCount << " failures, and " << wireTestTcpByteCount << " bytes, FAILED." << std::endl; std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, FAILED." << std::endl;
return -1; return -1;
} else { } else {
std::cout << "got " << wireTestTcpConnectSuccessCount << " connect successes, " << wireTestTcpConnectFailCount << " failures, and " << wireTestTcpByteCount << " bytes, OK" << std::endl; std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, OK" << std::endl;
} }
#endif // ZT_TEST_WIRE #endif // ZT_TEST_PHY
return 0; return 0;
} }
@ -850,7 +850,7 @@ int main(int argc,char **argv)
srand((unsigned int)time(0)); srand((unsigned int)time(0));
r |= testWire(); r |= testPhy();
r |= testSqliteNetconfMaster(); r |= testSqliteNetconfMaster();
r |= testCrypto(); r |= testCrypto();
r |= testHttp(); r |= testHttp();

Write Preview
Loading…
Cancel
Save