1 files changed, 55 insertions, 34 deletions

diff --git a/tests/websockets_bi_side_bigdata.c b/tests/websockets_bi_side_bigdata.c
index 9b67fe4c..d131e6e0 100644
--- a/tests/websockets_bi_side_bigdata.c
+++ b/tests/websockets_bi_side_bigdata.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/ioctl.h>
 #if EMSCRIPTEN
 #include <emscripten.h>
@@ -16,54 +17,74 @@
 
 #define EXPECTED_BYTES 5
 
-void stall(void *arg) {
-}
+int sockfd = -1;
+char *data = NULL;
 
-int main(void)
-{
-  struct sockaddr_in stSockAddr;
-  int Res;
-  int SocketFD = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+void finish(int result) {
+  close(sockfd);
+  exit(result);
+}
 
-  if (-1 == SocketFD)
-  {
-    perror("cannot create socket");
-    exit(EXIT_FAILURE);
+void loop() {
+  fd_set fdw;
+  int res;
+
+  // make sure that sockfd has finished connecting and is ready to write
+  FD_ZERO(&fdw);
+  FD_SET(sockfd, &fdw);
+  res = select(64, NULL, &fdw, NULL, NULL);
+  if (res == -1) {
+    perror("select failed");
+    finish(EXIT_FAILURE);
+    return;
+  } else if (!FD_ISSET(sockfd, &fdw)) {
+    return;
   }
 
-  memset(&stSockAddr, 0, sizeof(stSockAddr));
+  printf("send..\n");
 
-  stSockAddr.sin_family = AF_INET;
-  stSockAddr.sin_port = htons(SOCKK);
-  Res = inet_pton(AF_INET, "127.0.0.1", &stSockAddr.sin_addr);
+  res = send(sockfd, data, DATA_SIZE, 0);
+  if (res == -1) {
+    if (errno != EAGAIN) {
+      perror("send error");
+      finish(EXIT_FAILURE);
+    }
+    return;
+  }
 
-  if (0 > Res) {
-    perror("error: first parameter is not a valid address family");
-    close(SocketFD);
-    exit(EXIT_FAILURE);
-  } else if (0 == Res) {
-    perror("char string (second parameter does not contain valid ipaddress)");
-    close(SocketFD);
+  finish(EXIT_SUCCESS);
+}
+
+int main() {
+  struct sockaddr_in addr;
+  int res;
+  
+  sockfd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (sockfd == -1) {
+    perror("cannot create socket");
     exit(EXIT_FAILURE);
   }
+  fcntl(sockfd, F_SETFL, O_NONBLOCK);
+
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(SOCKK);
+  if (inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr) != 1) {
+    perror("inet_pton failed");
+    finish(EXIT_FAILURE);
+  }
 
   printf("connect..\n");
 
-  if (-1 == connect(SocketFD, (struct sockaddr *)&stSockAddr, sizeof(stSockAddr))) {
+  res = connect(sockfd, (struct sockaddr *)&addr, sizeof(addr));
+  if (res == -1 && errno != EINPROGRESS) {
     perror("connect failed");
-    close(SocketFD);
-    exit(EXIT_FAILURE);
+    finish(EXIT_FAILURE);
   }
 
-  printf("send..\n");
-
-  char *data = generateData();
-  send(SocketFD, data, DATA_SIZE, 0);
-
-  printf("stall..\n");
+  data = generateData();
 
-  emscripten_set_main_loop(stall, 1, 0);
+  emscripten_set_main_loop(loop, 1, 0);
 
   return EXIT_SUCCESS;
-}
-
+}
\ No newline at end of file