Browse Source

Updated to newest kNet.

Lasse Öörni 14 years ago
parent
commit
667258b618

+ 1 - 1
Docs/Urho3D.dox

@@ -64,7 +64,7 @@ Urho3D uses the following third-party libraries:
 - FreeType 2.3.12 (http://www.freetype.org/)
 - GLee 5.4 (http://elf-stone.com/)
 - GLFW 3.0 WIP (http://www.glfw.org/)
-- kNet (https://bitbucket.org/clb/knet)
+- kNet (https://github.com/juj/kNet)
 - libcpuid 0.2.0 (http://libcpuid.sourceforge.net/)
 - Open Asset Import Library, svn rev 1102 (http://assimp.sourceforge.net/)
 - Open Dynamics %Engine, svn rev 1846 (http://www.ode.org/)

+ 1 - 1
Readme.txt

@@ -40,7 +40,7 @@ Urho3D uses the following third-party libraries:
 - FreeType 2.3.12 (http://www.freetype.org/)
 - GLee 5.4 (http://elf-stone.com/)
 - GLFW 3.0 WIP (http://www.glfw.org/)
-- kNet (https://bitbucket.org/clb/knet)
+- kNet (https://github.com/juj/kNet)
 - libcpuid 0.2.0 (http://libcpuid.sourceforge.net/)
 - Open Asset Import Library, svn rev 1102 (http://assimp.sourceforge.net/)
 - Open Dynamics Engine, svn rev 1846 (http://www.ode.org/)

+ 1 - 1
ThirdParty/kNet/include/kNet/Alignment.h

@@ -20,7 +20,7 @@
 
 #include "Types.h"
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #include <stdint.h>
 #endif
 

+ 1 - 1
ThirdParty/kNet/include/kNet/EndPoint.h

@@ -18,7 +18,7 @@
 
 // Modified by Lasse Öörni for Urho3D
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+ 1 - 1
ThirdParty/kNet/include/kNet/Event.h

@@ -98,7 +98,7 @@ public:
 
 	/// Wraps the given WSAEVENT into this event.
 	explicit Event(WSAEVENT wsaEvent, EventWaitType eventType);
-#elif defined(UNIX)
+#elif defined(UNIX) || defined(ANDROID)
 public:
 	int fd[2]; // fd[0] is used for reading, fd[1] for writing.
 

+ 1 - 1
ThirdParty/kNet/include/kNet/EventArray.h

@@ -61,7 +61,7 @@ private:
 #ifdef WIN32
 	WSAEVENT events[maxEvents]; 
 
-#elif defined(UNIX)
+#elif defined(UNIX) || defined(ANDROID)
 	fd_set readfds;
 	fd_set writefds;
 	int nfds;

+ 1 - 1
ThirdParty/kNet/include/kNet/Network.h

@@ -18,7 +18,7 @@
 
 // Modified by Lasse Öörni for Urho3D
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+ 1 - 1
ThirdParty/kNet/include/kNet/Socket.h

@@ -31,7 +31,7 @@ namespace kNet
 typedef int socklen_t;
 }
 
-#elif defined(UNIX)
+#elif defined(UNIX) || defined(ANDROID)
 
 #include <sys/types.h>
 #include <sys/socket.h>

+ 2 - 1
ThirdParty/kNet/src/Network.cpp

@@ -21,7 +21,7 @@
 
 #include <cassert>
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -779,6 +779,7 @@ void Network::SendUDPConnectDatagram(Socket &socket, Datagram *connectMessage)
 	if (!sendData)
 	{
 		LOG(LogError, "Network::SendUDPConnectDatagram: socket.BeginSend failed! Cannot send UDP connection datagram!");
+		return;
 	}
 	if (connectMessage)
 	{

+ 1 - 1
ThirdParty/kNet/src/NetworkLogging.cpp

@@ -35,7 +35,7 @@
 #include "kNet/Lockable.h"
 #include "kNet/Clock.h"
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #define _snprintf snprintf
 #endif
 

+ 2 - 2
ThirdParty/kNet/src/Socket.cpp

@@ -36,7 +36,7 @@
 
 using namespace std;
 
-#ifdef UNIX
+#if defined(UNIX) || defined(ANDROID)
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -881,7 +881,7 @@ bool Socket::EndSend(OverlappedTransferBuffer *sendBuffer)
 	}
 	return true;
 
-#elif defined(UNIX)
+#elif defined(UNIX) || defined(ANDROID)
 	bool success = Send(sendBuffer->buffer.buf, sendBuffer->buffer.len);
 	DeleteOverlappedTransferBuffer(sendBuffer);
 	return success;

+ 4 - 2
ThirdParty/kNet/src/win32/W32Event.cpp

@@ -64,14 +64,16 @@ void Event::Reset()
 {
 	if (wsaEvent == NULL)
 		LOG(LogError, "Event::Reset called on a null event!");
-	WSAResetEvent(wsaEvent);
+	else
+		WSAResetEvent(wsaEvent);
 }
 
 void Event::Set()
 {
 	if (wsaEvent == NULL)
 		LOG(LogError, "Event::Set called on a null event!");
-	WSASetEvent(wsaEvent);
+	else
+		WSASetEvent(wsaEvent);
 }
 
 bool Event::Test() const