From: danselmi <redacted>
Date: Thu, 17 Jan 2019 11:31:23 +0000 (+0100)
Subject: ipdbg-la: working on windows
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c54ca323400bd03400e489cd5661bc28d81410c2;p=libsigrok.git

ipdbg-la: working on windows
---

diff --git a/src/hardware/ipdbg-la/protocol.c b/src/hardware/ipdbg-la/protocol.c
index 4c8f33b4..ac36b060 100644
--- a/src/hardware/ipdbg-la/protocol.c
+++ b/src/hardware/ipdbg-la/protocol.c
@@ -67,18 +67,15 @@ static gboolean data_available(struct ipdbg_la_tcp *tcp)
 {
 #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)
@@ -145,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;