SAVE some updateswindows

after adding websockets
TODO: check websockets on Windows ??

1 files changed, 7 insertions, 6 deletions

diff --git a/server/tests/test-websocket.c b/server/tests/test-websocket.c
index a1e70c22..9d41b90c 100644
--- a/server/tests/test-websocket.c
+++ b/server/tests/test-websocket.c
@@ -79,6 +79,7 @@ wait_for(socket_t sock, short events)
 {
     struct pollfd fds[1] = { { socket_get_raw(sock), events, 0 } };
     for (;;) {
+        // TODO Windows
         switch (poll(fds, 1, -1)) {
         case -1:
             if (errno == EINTR) {
@@ -104,22 +105,22 @@ wait_for(socket_t sock, short events)
 static ssize_t
 ws_read(void *opaque, void *buf, size_t nbyte)
 {
-    int sock = GPOINTER_TO_INT(opaque);
-    return recv(sock, buf, nbyte, MSG_NOSIGNAL);
+    socket_t sock = SOCKET_FROM_INT(GPOINTER_TO_INT(opaque));
+    return socket_read(sock, buf, nbyte);
 }
 
 static ssize_t
 ws_write(void *opaque, const void *buf, size_t nbyte)
 {
-    int sock = GPOINTER_TO_INT(opaque);
-    return send(sock, buf, nbyte, MSG_NOSIGNAL);
+    socket_t sock = SOCKET_FROM_INT(GPOINTER_TO_INT(opaque));
+    return socket_write(sock, buf, nbyte);
 }
 
 static ssize_t
 ws_writev(void *opaque, struct iovec *iov, int iovcnt)
 {
-    int sock = GPOINTER_TO_INT(opaque);
-    return writev(sock, iov, iovcnt);
+    socket_t sock = SOCKET_FROM_INT(GPOINTER_TO_INT(opaque));
+    return socket_writev(sock, iov, iovcnt);
 }
 
 static void