Merge branch 'adamierymenko-dev' into netcon

This commit is contained in:
Adam Ierymenko
2015-10-06 17:56:47 -07:00
49 changed files with 2557 additions and 1196 deletions

View File

@ -161,7 +161,7 @@
/**
* Default MTU used for Ethernet tap device
*/
#define ZT_IF_MTU ZT1_MAX_MTU
#define ZT_IF_MTU ZT_MAX_MTU
/**
* Maximum number of packet fragments we'll support
@ -324,6 +324,13 @@
*/
#define ZT_DIRECT_PATH_PUSH_INTERVAL 300000
/**
* How long (max) to remember network certificates of membership?
*
* This only applies to networks we don't belong to.
*/
#define ZT_PEER_NETWORK_COM_EXPIRATION 3600000
/**
* Sanity limit on maximum bridge routes
*