X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fipdbg-la%2Fprotocol.c;h=ac36b060839ab61c477506bff5e3fa5668060f82;hb=c54ca323400bd03400e489cd5661bc28d81410c2;hp=367483fa04079e34af7cfbc939ba9dde423d6091;hpb=3bfdadf6df08ccdc7fcbee8ab2f6789910cc8674;p=libsigrok.git

diff --git a/src/hardware/ipdbg-la/protocol.c b/src/hardware/ipdbg-la/protocol.c
index 367483fa..ac36b060 100644
--- a/src/hardware/ipdbg-la/protocol.c
+++ b/src/hardware/ipdbg-la/protocol.c
@@ -23,19 +23,15 @@
 #define _WIN32_WINNT 0x0501
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#endif
-
-#include <string.h>
-#include <unistd.h>
-
-#ifndef _WIN32
+#else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
 #endif
-
+#include <string.h>
+#include <unistd.h>
 #include <errno.h>
 #include "protocol.h"
 
@@ -69,20 +65,17 @@
 
 static gboolean data_available(struct ipdbg_la_tcp *tcp)
 {
-#ifdef __WIN32__
+#ifdef _WIN32
 	u_long bytes_available;
-	ioctlsocket(tcp->socket, FIONREAD, &bytes_available);
-	return (bytes_available > 0);
+	if(ioctlsocket(tcp->socket, FIONREAD, &bytes_available) != 0){
 #else
-	int status;
-
-	if (ioctl(tcp->socket, FIONREAD, &status) < 0) {	// TIOCMGET
+	int bytes_available;
+	if (ioctl(tcp->socket, FIONREAD, &bytes_available) < 0){ 	// TIOCMGET
+#endif
 		sr_err("FIONREAD failed: %s\n", g_strerror(errno));
 		return FALSE;
 	}
-
-	return (status < 1) ? FALSE : TRUE;
-#endif
+	return (bytes_available > 0);
 }
 
 SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void)
@@ -149,6 +142,15 @@ SR_PRIV int ipdbg_la_tcp_close(struct ipdbg_la_tcp *tcp)
 {
 	int ret = SR_OK;
 
+#ifdef _WIN32
+	if (shutdown(tcp->socket, SD_SEND) != SOCKET_ERROR)
+	{
+		char recvbuf[16];
+		int recvbuflen = 16;
+		// Receive until the peer closes the connection
+		while(recv(tcp->socket, recvbuf, recvbuflen, 0) > 0);
+	}
+#endif
 	if (close(tcp->socket) < 0)
 		ret = SR_ERR;
 
@@ -160,7 +162,7 @@ SR_PRIV int ipdbg_la_tcp_close(struct ipdbg_la_tcp *tcp)
 static int tcp_send(struct ipdbg_la_tcp *tcp, const uint8_t *buf, size_t len)
 {
 	int out;
-	out = send(tcp->socket, buf, len, 0);
+	out = send(tcp->socket, (const char *)buf, len, 0);
 
 	if (out < 0) {
 		sr_err("Send error: %s", g_strerror(errno));
@@ -200,7 +202,7 @@ SR_PRIV int ipdbg_la_tcp_receive(struct ipdbg_la_tcp *tcp,
 
 	if (data_available(tcp)) {
 		while (received < 1) {
-			int len = recv(tcp->socket, buf, 1, 0);
+			int len = recv(tcp->socket, (char *)buf, 1, 0);
 
 			if (len < 0) {
 				sr_err("Receive error: %s", g_strerror(errno));