Sfoglia il codice sorgente

Some file format cleanup.

Adam Ierymenko 12 anni fa
parent
commit
b2b24ca41b
6 ha cambiato i file con 6 aggiunte e 2 eliminazioni
  1. 1 0
      node/Defaults.hpp
  2. 1 0
      node/Dictionary.hpp
  3. 1 0
      node/InetAddress.cpp
  4. 1 1
      node/Multicaster.hpp
  5. 1 0
      node/Network.cpp
  6. 1 1
      node/Switch.hpp

+ 1 - 0
node/Defaults.hpp

@@ -32,6 +32,7 @@
 #include <string>
 #include <vector>
 #include <map>
+
 #include "Identity.hpp"
 #include "InetAddress.hpp"
 

+ 1 - 0
node/Dictionary.hpp

@@ -31,6 +31,7 @@
 #include <string>
 #include <map>
 #include <stdexcept>
+ 
 #include "Constants.hpp"
 
 namespace ZeroTier {

+ 1 - 0
node/InetAddress.cpp

@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "Constants.hpp"

+ 1 - 1
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;

+ 1 - 0
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"

+ 1 - 1
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"