Merging branches/v0.5-peernet/libbitdht (Merging r4237 through r4353 into '.')

There are many significant improvements to the DHT here. 
See commit logs on v0.5-peernet branch for details.

This is not the final merge, but brings over the majority of expected v0.5-peernet/libbitdht changes 




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4354 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libbitdht/src/util/bdnet.cc

@@ -256,7 +256,11 @@ int bdnet_w2u_errno(int err)
 			break;
 		 *
 		 ***/
-		
+	
+		case WSANOTINITIALISED:	
+			std::cerr << "tou_net_w2u_errno(" << err << ") WSANOTINITIALISED. Fix Your Code!";
+			std::cerr << std::endl;
+			break;
 		default:
 			std::cerr << "tou_net_w2u_errno(" << err << ") Unknown";
 			std::cerr << std::endl;
@@ -346,3 +350,10 @@ ssize_t bdnet_sendto(int s, const void *buf, size_t len, int flags,
 #endif
 /********************************** WINDOWS/UNIX SPECIFIC PART ******************/
 
+
+void    bdsockaddr_clear(struct sockaddr_in *addr)
+{
+	memset(addr, 0, sizeof(*addr));
+}
+
+

libbitdht/src/util/bdnet.h

@@ -103,7 +103,7 @@ int bdnet_inet_aton(const char *name, struct in_addr *addr);
 /* check if we can modify the TTL on a UDP packet */
 int bdnet_checkTTL(int fd);
 
-
+void	bdsockaddr_clear(struct sockaddr_in *addr);
 
 /* Extra stuff to declare for windows error handling (mimics unix errno)
  */

libbitdht/src/util/bdrandom.cc

@@ -0,0 +1,93 @@
+#include <stdlib.h>
+#include <string>
+#include <unistd.h>
+#include "util/bdrandom.h"
+
+uint32_t bdRandom::index = 0 ;
+std::vector<uint32_t> bdRandom::MT(bdRandom::N,0u) ;
+bdMutex bdRandom::rndMtx ;
+
+#if defined(_WIN32) || defined(__MINGW32__)
+static bool auto_seed = bdRandom::seed( (time(NULL) + ((uint32_t) pthread_self().p)*0x1293fe)^0x18e34a12 ) ;
+#else
+  #ifdef __APPLE__
+	static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
+  #else
+    static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
+  #endif
+#endif
+bool bdRandom::seed(uint32_t s) 
+{
+	bdStackMutex mtx(rndMtx) ;
+
+	MT.resize(N,0) ;	// because MT might not be already resized
+
+	uint32_t j ;
+	MT[0]= s & 0xffffffffUL;
+	for (j=1; j<N; j++) 
+		MT[j] = (1812433253UL * (MT[j-1] ^ (MT[j-1] >> 30)) + j) & 0xffffffffUL ;
+
+	return true ;
+}
+
+void bdRandom::locked_next_state() 
+{
+	for(uint32_t i=0;i<N;++i)
+	{
+		uint32_t y = ((MT[i]) & UMASK) | ((MT[(i+1)%(int)N]) & LMASK) ;
+
+		MT[i] = MT[(i + M) % (int)N] ^ (y >> 1) ;
+
+		if((y & 1) == 1) 
+			MT[i] = MT[i] ^ 0x9908b0df ;
+	}
+	index = 0 ;
+}
+
+uint32_t bdRandom::random_u32() 
+{
+	uint32_t y;
+
+	{
+		bdStackMutex mtx(rndMtx) ;
+
+		y = MT[index++] ;
+
+		if(index == N)
+			locked_next_state();
+	}
+
+	// Tempering
+	y ^= (y >> 11);
+	y ^= (y << 7 ) & 0x9d2c5680UL;
+	y ^= (y << 15) & 0xefc60000UL;
+	y ^= (y >> 18);
+
+	return y;
+}
+
+uint64_t bdRandom::random_u64() 
+{
+	return ((uint64_t)random_u32() << 32ul) + random_u32() ;
+}
+
+float bdRandom::random_f32() 
+{
+	return random_u32() / (float)(~(uint32_t)0) ;
+}
+
+double bdRandom::random_f64() 
+{
+	return random_u64() / (double)(~(uint64_t)0) ;
+}
+
+std::string bdRandom::random_alphaNumericString(uint32_t len)
+{
+	std::string s = "" ;
+
+	for(uint32_t i=0;i<len;++i)
+		s += (char)( (random_u32()%94) + 33) ;
+
+	return s ;
+}
+

libbitdht/src/util/bdrandom.h

@@ -0,0 +1,71 @@
+#ifndef BITDHT_UTILS_BDRANDOM_H
+#define BITDHT_UTILS_BDRANDOM_H
+
+
+/****************************************************************
+ *  libbitdht is distributed under the following license:
+ *
+ *  Copyright (C) 2010 Cyril Soler <csoler@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+/* This Source Code is basically a direct copy of libretroshare's RsRandom.
+ * the function names have just been renamed. drbob
+ */
+
+
+// bdRandom contains a random number generator that is
+// - thread safe
+// - system independant
+// - fast
+// - cryptographically safe
+//
+// The implementation is adapted from the Mersenne Twister page of Wikipedia.
+//
+// 		http://en.wikipedia.org/wiki/Mersenne_twister
+
+#include <vector>
+#include "util/bdthreads.h"
+
+class bdRandom
+{
+	public:
+		static uint32_t random_u32() ;
+		static uint64_t random_u64() ;
+		static float 	 random_f32() ;
+		static double	 random_f64() ;
+
+		static bool     seed(uint32_t s) ;
+
+		static std::string random_alphaNumericString(uint32_t length) ; 
+
+	private:
+		static bdMutex rndMtx ;
+
+		static const uint32_t N = 624;
+		static const uint32_t M = 397;
+
+		static const uint32_t MATRIX_A 	= 0x9908b0dfUL;
+		static const uint32_t UMASK 		= 0x80000000UL;
+		static const uint32_t LMASK 		= 0x7fffffffUL;
+
+		static void locked_next_state() ;
+		static uint32_t index ;
+		static std::vector<uint32_t> MT ;
+};
+
+#endif