diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-17 15:46:56 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-17 15:46:56 -0400 |
| commit | b2b24ca41b9aacb502f6569934b446b2ef4338c2 (patch) | |
| tree | 276d14edf44e8d80a110d82cf926890a72e7210d /node | |
| parent | 0133da1dcdaba9654e79506c4baeed506b6a4e30 (diff) | |
| download | infinitytier-b2b24ca41b9aacb502f6569934b446b2ef4338c2.tar.gz infinitytier-b2b24ca41b9aacb502f6569934b446b2ef4338c2.zip | |
Some file format cleanup.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Defaults.hpp | 1 | ||||
| -rw-r--r-- | node/Dictionary.hpp | 1 | ||||
| -rw-r--r-- | node/InetAddress.cpp | 1 | ||||
| -rw-r--r-- | node/Multicaster.hpp | 2 | ||||
| -rw-r--r-- | node/Network.cpp | 1 | ||||
| -rw-r--r-- | node/Switch.hpp | 2 |
6 files changed, 6 insertions, 2 deletions
diff --git a/node/Defaults.hpp b/node/Defaults.hpp index fe79d525..787193dc 100644 --- a/node/Defaults.hpp +++ b/node/Defaults.hpp @@ -32,6 +32,7 @@ #include <string> #include <vector> #include <map> + #include "Identity.hpp" #include "InetAddress.hpp" diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp index 178810ff..a0a64cec 100644 --- a/node/Dictionary.hpp +++ b/node/Dictionary.hpp @@ -31,6 +31,7 @@ #include <string> #include <map> #include <stdexcept> + #include "Constants.hpp" namespace ZeroTier { diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp index b2476893..3f643639 100644 --- a/node/InetAddress.cpp +++ b/node/InetAddress.cpp @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdint.h> + #include <string> #include "Constants.hpp" diff --git a/node/Multicaster.hpp b/node/Multicaster.hpp index 3a4f355d..77c7c532 100644 --- a/node/Multicaster.hpp +++ b/node/Multicaster.hpp @@ -178,7 +178,7 @@ public: throw() { for(unsigned int i=0;i<ZT_MULTICAST_DEDUP_HISTORY_LENGTH;++i) { - if ((_multicastHistory[i][0] == crc)&&((now - _multicastHistory[i][1]) < ZT_MULTICAST_DEDUP_HISTORY_EXPIRE)) + if ((_multicastHistory[i][0] == crc)&&((now - _multicastHistory[i][1]) <= ZT_MULTICAST_DEDUP_HISTORY_EXPIRE)) return true; } return false; diff --git a/node/Network.cpp b/node/Network.cpp index 6a28228b..b9ab513d 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -30,6 +30,7 @@ #include <stdlib.h> #include <math.h> +#include "Constants.hpp" #include "RuntimeEnvironment.hpp" #include "NodeConfig.hpp" #include "Network.hpp" diff --git a/node/Switch.hpp b/node/Switch.hpp index 71e1e386..edfb6f15 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -33,10 +33,10 @@ #include <vector> #include <list> +#include "Constants.hpp" #include "Mutex.hpp" #include "MAC.hpp" #include "NonCopyable.hpp" -#include "Constants.hpp" #include "Packet.hpp" #include "Utils.hpp" #include "InetAddress.hpp" |