Fix httpClient example on windows.

Author: StringEpsilon

src/fbNetworkClient.bas

@@ -29,7 +29,6 @@ function getIpAdress(addressInfo as addrInfo ptr) as string
 		IP = space(16)
 		inet_ntop( addressInfo->ai_family, @(cast(sockaddr_in ptr,addressInfo->ai_addr)->sin_addr), strptr(IP), len(IP) )
 	end if
-	
 	return trim(IP)
 end function
 
@@ -124,26 +123,38 @@ function fbNetworkClient.open(address as string, _port as uinteger, timeoutValue
 			return false
 		end if
 
-		dim socketFlags as integer = fcntl(this._socket, F_GETFL, 0)
-		fcntl(this._socket, F_SETFL, socketFlags or O_NONBLOCK)
+		#ifdef __FB_WIN32__
+			dim as integer blocking = 1
+			ioctlsocket(this._socket, FIONBIO, @blocking)
+		#else
+			dim socketFlags as integer = fcntl(this._socket, F_GETFL, 0)
+			fcntl(this._socket, F_SETFL, socketFlags or O_NONBLOCK)
+		#endif
 		if (connect( this._socket, this._addressInfo->ai_addr, this._addressInfo->ai_addrlen) <> 0) then
 			dim timeout as timeval
 			dim as fd_set fdset
 			timeout.tv_sec = timeoutValue
 			timeout.tv_usec = 0
 			FD_ZERO(@fdset)
 			FD_SET_(this._socket, @fdset)
-			dim foo as integer = select_(this._socket+1, 0, @fdset, 0, @timeout) 
-			if (foo = 1) then
+			if ( select_(this._socket+1, 0, @fdset, 0, @timeout) = 1) then
 				dim as integer socketError
-				dim as socklen_t length = sizeof(so_error)
-
-				getsockopt(this._socket, SOL_SOCKET, SO_ERROR, @socketError, @length)
+				
+				#ifdef __FB_WIN32__
+					socketError = WSAGetLastError()
+				#else
+					dim as socklen_t length = sizeof(so_error)
+					getsockopt(this._socket, SOL_SOCKET, SO_ERROR, @socketError, @length)
+				#endif
 				if (socketError) then
 					this.errorHandler(net_undefined)
 					return false
 				end if
-				fcntl(this._socket, F_SETFL, socketFlags AND NOT O_NONBLOCK)
+				#ifdef __FB_WIN32__
+					blocking = 0 : ioctlsocket(this._socket, FIONBIO, @blocking)
+				#else
+					fcntl(this._socket, F_SETFL, socketFlags or O_NONBLOCK)
+				#endif
 			else
 				this.errorHandler(net_timeout)
 				return false
@@ -160,12 +171,17 @@ function fbNetworkClient.open(address as string, _port as uinteger, timeoutValue
 	do 
 		messageLength = recv( this._socket, recvBuffer, fbNetwork.RECVBUFFLEN, 0 )
 		if( messageLength  <= 0 ) then
+			closesocket(this._socket)
+			freeaddrinfo(this._addressInfo)	
+			this._socket = 0
+			this._addressInfo = 0
 			this.close()
 			return true
 		end if
 		recvbuffer[messageLength] = 0
 		this.onMessage(recvbuffer)
 	loop
+
 
 	return true
 end function

src/fbNetworkClient.bi

@@ -6,6 +6,15 @@
 
 #ifdef __FB_WIN32__
 	#include once "win/winsock2.bi"
+
+	#include once "win/ws2tcpip.bi"
+	#ifndef inet_ntop
+	extern "C"
+	' For some reason, inet_ntop from the ws2tcpip.bi isn't defined on my machine.
+	declare function inet_ntop stdcall alias "inet_ntop"(byval Family as INT_, byval pAddr as PVOID, byval pStringBuf as LPSTR, byval StringBufSize as uinteger) as LPCSTR
+	end extern
+	#endif
+	WSAStartup( MAKEWORD( 2, 0 ), new WSAData )
 #else
 	#include once "crt/netdb.bi"
 	#include once "crt/fcntl.bi"
@@ -16,6 +25,8 @@
 	#include once "crt/sys/select.bi"
 #endif
 
+
+
 declare function resolveHost( byref hostname as string, port as uinteger ) as addrinfo ptr
 declare function getIpAdress(addressInfo as addrInfo ptr) as string
 
@@ -59,7 +70,7 @@ type fbNetworkClient extends object
 		declare constructor()
 		declare destructor()
 
-		declare function open(address as string, port as uinteger, timeout as clong = 60, protocol as TransportProtocol = TCP) as boolean
+		declare function open(address as string, _port as uinteger, timeoutValue as integer = 60, _protocol as TransportProtocol = TCP ) as boolean
 		declare sub close()
 		declare function sendData(byref _data as string) as boolean