Make TCP optional, rename port constant.

This commit is contained in:
Adam Ierymenko 2014-03-27 18:22:53 -07:00
parent 73c1d43f2f
commit 181369964f
4 changed files with 21 additions and 12 deletions

View file

@ -114,9 +114,9 @@ error_no_byte_order_defined;
#define ZT_ADDRESS_RESERVED_PREFIX 0xff
/**
* Default local port for ZeroTier traffic
* Default local port for ZeroTier UDP traffic
*/
#define ZT_DEFAULT_PORT 9993
#define ZT_DEFAULT_UDP_PORT 9993
/**
* Default payload MTU for UDP packets

View file

@ -377,8 +377,8 @@ Node::Node(const char *hp,unsigned int udpPort,unsigned int tcpPort,bool resetId
}
}
impl->udpPort = ((udpPort > 0)&&(udpPort <= 0xffff)) ? udpPort : (unsigned int)ZT_DEFAULT_PORT;
impl->tcpPort = ((tcpPort > 0)&&(tcpPort <= 0xffff)) ? tcpPort : (unsigned int)ZT_DEFAULT_PORT;
impl->udpPort = udpPort & 0xffff;
impl->tcpPort = tcpPort & 0xffff;
impl->reasonForTermination = Node::NODE_RUNNING;
impl->started = false;
impl->running = false;

View file

@ -153,11 +153,11 @@ public:
* The node is not executed until run() is called.
*
* @param hp Home directory path or NULL for system-wide default for this platform (default: NULL)
* @param udpPort UDP port or 0 for default (9993) (default: 0)
* @param tcpPort TCP port or 0 for default (9993) (default: 0)
* @param udpPort UDP port or 0 to disable (default: 9993)
* @param tcpPort TCP port or 0 to disable (default: 0)
* @param resetIdentity If true, delete identity before starting and regenerate (default: false)
*/
Node(const char *hp = (const char *)0,unsigned int udpPort = 0,unsigned int tcpPort = 0,bool resetIdentity = false)
Node(const char *hp = (const char *)0,unsigned int udpPort = 9993,unsigned int tcpPort = 0,bool resetIdentity = false)
throw();
~Node();