iodine 0.7.44 → 0.7.47

data/ext/iodine/http_internal.c

@@ -98,6 +98,7 @@ int http_send_error2(size_t error, intptr_t uuid, http_settings_s *settings) {
     return -1;
   fio_protocol_s *pr = http1_new(uuid, settings, NULL, 0);
   http_s *r = fio_malloc(sizeof(*r));
+  FIO_ASSERT_ALLOC(r);
   FIO_ASSERT(pr, "Couldn't allocate response object for error report.")
   http_s_new(r, (http_fio_protocol_s *)pr, http1_vtable());
   int ret = http_send_error(r, error);

data/ext/iodine/http_internal.h

@@ -15,7 +15,9 @@ Feel free to copy, use and enjoy according to the license provided.
 
 #include <http.h>
 
+#ifndef __MINGW32__
 #include <arpa/inet.h>
+#endif
 #include <errno.h>
 
 /* *****************************************************************************
@@ -121,8 +123,8 @@ static inline void http_s_destroy(http_s *h, uint8_t log) {
   fiobj_free(h->params);
 
   *h = (http_s){
-      .private_data.vtbl = h->private_data.vtbl,
-      .private_data.flag = h->private_data.flag,
+    .private_data.vtbl = h->private_data.vtbl,
+    .private_data.flag = h->private_data.flag,
   };
 }
 

data/ext/iodine/iodine.c

@@ -519,6 +519,7 @@ static VALUE iodine_cli_parse(VALUE self) {
     rb_hash_aset(defaults, max_headers_sym,
                  INT2NUM((fio_cli_get_i("-maxhd") /* * 1024 */)));
   }
+#ifndef __MINGW32__
   if (fio_cli_get_bool("-tls") || fio_cli_get("-key") || fio_cli_get("-cert")) {
     VALUE rbtls = IodineCaller.call(IodineTLSClass, rb_intern2("new", 3));
     if (rbtls == Qnil) {
@@ -543,6 +544,7 @@ static VALUE iodine_cli_parse(VALUE self) {
     }
     rb_hash_aset(defaults, tls_sym, rbtls);
   }
+#endif
   if (fio_cli_unnamed_count()) {
     rb_hash_aset(defaults, ID2SYM(rb_intern("filename_")),
                  rb_str_new_cstr(fio_cli_unnamed(0)));
@@ -634,8 +636,10 @@ FIO_FUNC void iodine_connect_args_cleanup(iodine_connection_args_s *s) {
     fio_free(s->port.data);
   if (s->address.capa)
     fio_free(s->address.data);
+#ifndef __MINGW32__
   if (s->tls)
     fio_tls_destroy(s->tls);
+#endif
 }
 
 /*
@@ -686,7 +690,9 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
   VALUE r_public = rb_hash_aref(s, public_sym);
   VALUE service = rb_hash_aref(s, service_sym);
   VALUE timeout = rb_hash_aref(s, timeout_sym);
+#ifndef __MINGW32__
   VALUE tls = rb_hash_aref(s, tls_sym);
+#endif
   VALUE r_url = rb_hash_aref(s, url_sym);
   fio_str_info_s service_str = {.data = NULL};
 
@@ -726,8 +732,10 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
   //   service = rb_hash_aref(iodine_default_args, service_sym);
   if (timeout == Qnil)
     timeout = rb_hash_aref(iodine_default_args, timeout_sym);
+#ifndef __MINGW32__
   if (tls == Qnil)
     tls = rb_hash_aref(iodine_default_args, tls_sym);
+#endif
 
   /* TODO: deprecation */
   if (handler == Qnil) {
@@ -824,11 +832,13 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
     else
       r.timeout = FIX2ULONG(timeout);
   }
+#ifndef __MINGW32__
   if (tls != Qnil) {
     r.tls = iodine_tls2c(tls);
     if (r.tls)
       fio_tls_dup(r.tls);
   }
+#endif
   /* URL parsing */
   if (r_url != Qnil && RB_TYPE_P(r_url, T_STRING)) {
     r.url = IODINE_RSTRINFO(r_url);
@@ -888,6 +898,56 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
   /* test/set service type */
   r.service = IODINE_SERVICE_RAW;
   if (service_str.data) {
+#ifdef __MINGW32__
+    switch (service_str.data[0]) {
+    case 't': /* overflow */
+              /* tcp or tls */
+      if (service_str.data[1] == 'l') {
+        char *local = NULL;
+        char buf[1024];
+        buf[1023] = 0;
+        if (is_srv) {
+          local = buf;
+          if (fio_local_addr(buf, 1023) >= 1022)
+            local = NULL;
+        }
+      }
+      /* overflow */
+    case 'u': /* overflow */
+    /* unix */
+    case 'r':
+      /* raw */
+      r.service = IODINE_SERVICE_RAW;
+      break;
+    case 'h':
+      /* http(s) */
+      r.service = IODINE_SERVICE_HTTP;
+      if (service_str.len == 5) {
+        char *local = NULL;
+        char buf[1024];
+        buf[1023] = 0;
+        if (is_srv) {
+          local = buf;
+          if (fio_local_addr(buf, 1023) >= 1022)
+            local = NULL;
+        }
+      }
+    case 'w':
+      /* ws(s) */
+      r.service = IODINE_SERVICE_WS;
+      if (service_str.len == 3) {
+        char *local = NULL;
+        char buf[1024];
+        buf[1023] = 0;
+        if (is_srv) {
+          local = buf;
+          if (fio_local_addr(buf, 1023) >= 1022)
+            local = NULL;
+        }
+      }
+      break;
+    }
+#else
     switch (service_str.data[0]) {
     case 't': /* overflow */
               /* tcp or tls */
@@ -939,6 +999,7 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
       }
       break;
     }
+#endif
   }
   return r;
 }
@@ -1349,8 +1410,10 @@ void Init_iodine(void) {
   // initialize the HTTP module
   iodine_init_http();
 
+#ifndef __MINGW32__
   // initialize SSL/TLS support module
   iodine_init_tls();
+#endif
 
   // initialize JSON helpers
   iodine_init_json();

data/ext/iodine/iodine.h

@@ -15,7 +15,9 @@ typedef struct {
   fio_str_info_s body;
   fio_str_info_s public;
   fio_str_info_s url;
+#ifndef __MINGW32__
   fio_tls_s *tls;
+#endif
   VALUE handler;
   FIOBJ headers;
   FIOBJ cookies;

data/ext/iodine/iodine_caller.c

@@ -5,7 +5,19 @@
 
 #include <fio.h>
 
-static __thread volatile uint8_t iodine_GVL_state = 1;
+#include <pthread.h>
+
+static pthread_key_t iodine_GVL_state_key;
+static pthread_once_t iodine_GVL_state_once = PTHREAD_ONCE_INIT;
+static void init_iodine_GVL_state_key(void) {
+  pthread_key_create(&iodine_GVL_state_key, NULL); 
+}
+static void init_iodine_GVL_state_init(void) {
+  uint8_t *gvl = malloc(sizeof(uint8_t));
+  FIO_ASSERT_ALLOC(gvl);
+  *gvl = 1;
+  pthread_setspecific(iodine_GVL_state_key, gvl);
+}
 
 /* *****************************************************************************
 Calling protected Ruby methods
@@ -84,25 +96,37 @@ API
 
 /** Calls a C function within the GVL. */
 static void *iodine_enterGVL(void *(*func)(void *), void *arg) {
-  if (iodine_GVL_state) {
+  pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
+  uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  if (!iodine_GVL_state) {
+    init_iodine_GVL_state_init();
+    iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  }
+  if (*iodine_GVL_state) {
     return func(arg);
   }
   void *rv = NULL;
-  iodine_GVL_state = 1;
+  *iodine_GVL_state = 1;
   rv = rb_thread_call_with_gvl(func, arg);
-  iodine_GVL_state = 0;
+  *iodine_GVL_state = 0;
   return rv;
 }
 
 /** Calls a C function outside the GVL. */
 static void *iodine_leaveGVL(void *(*func)(void *), void *arg) {
+  pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
+  uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
   if (!iodine_GVL_state) {
+    init_iodine_GVL_state_init();
+    iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  }
+  if (!*iodine_GVL_state) {
     return func(arg);
   }
   void *rv = NULL;
-  iodine_GVL_state = 0;
+  *iodine_GVL_state = 0;
   rv = rb_thread_call_without_gvl(func, arg, NULL, NULL);
-  iodine_GVL_state = 1;
+  *iodine_GVL_state = 1;
   return rv;
 }
 
@@ -151,10 +175,26 @@ static VALUE iodine_call_block(VALUE obj, ID method, int argc, VALUE *argv,
 }
 
 /** Returns the GVL state flag. */
-static uint8_t iodine_in_GVL(void) { return iodine_GVL_state; }
+static uint8_t iodine_in_GVL(void) {
+  pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
+  uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  if (!iodine_GVL_state) {
+    init_iodine_GVL_state_init();
+    iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  }
+  return *iodine_GVL_state;
+}
 
 /** Forces the GVL state flag. */
-static void iodine_set_GVL(uint8_t state) { iodine_GVL_state = state; }
+static void iodine_set_GVL(uint8_t state) { 
+  pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
+  uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  if (!iodine_GVL_state) {
+    init_iodine_GVL_state_init();
+    iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
+  }
+  *iodine_GVL_state = state;
+}
 
 /* *****************************************************************************
 Caller Initialization

data/ext/iodine/iodine_http.c

@@ -12,11 +12,15 @@ Feel free to copy, use and enjoy according to the license provided.
 #include <ruby/io.h>
 // #include "iodine_websockets.h"
 
+#ifndef __MINGW32__
 #include <arpa/inet.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef __MINGW32__
 #include <sys/socket.h>
+#endif
 
 /* *****************************************************************************
 Available Globals
@@ -365,7 +369,6 @@ static inline VALUE copy2env(iodine_http_request_handle_s *handle) {
   if (*pos == 0) {
     rb_hash_aset(env, SERVER_NAME,
                  rb_enc_str_new(tmp.data, tmp.len, IodineBinaryEncoding));
-    rb_hash_aset(env, SERVER_PORT, QUERY_ESTRING);
   } else {
     rb_hash_aset(
         env, SERVER_NAME,
@@ -865,7 +868,6 @@ static void initialize_env_template(void) {
   rb_hash_aset(env_template_no_upgrade, REMOTE_ADDR, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, REQUEST_METHOD, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_NAME, QUERY_STRING);
-  rb_hash_aset(env_template_no_upgrade, SERVER_PORT, QUERY_ESTRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_PROTOCOL, QUERY_STRING);
 
   /* WebSocket upgrade support */
@@ -938,6 +940,15 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
     support_xsendfile = 1;
   }
   IodineStore.add(args.handler);
+  #ifdef __MINGW32__
+    intptr_t uuid = http_listen(
+      args.port.data, args.address.data, .on_request = on_rack_request,
+      .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
+      .timeout = args.timeout, .ws_timeout = args.ping,
+      .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
+      .on_finish = free_iodine_http, .log = args.log,
+      .max_body_size = args.max_body, .public_folder = args.public.data);
+  #else
   intptr_t uuid = http_listen(
       args.port.data, args.address.data, .on_request = on_rack_request,
       .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
@@ -945,6 +956,7 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
       .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
       .on_finish = free_iodine_http, .log = args.log,
       .max_body_size = args.max_body, .public_folder = args.public.data);
+  #endif
   if (uuid == -1)
     return uuid;
 
@@ -1054,9 +1066,11 @@ intptr_t iodine_ws_connect(iodine_connection_args_s args) {
   FIOBJ url_tmp = FIOBJ_INVALID;
   if (!args.url.data) {
     url_tmp = fiobj_str_buf(64);
+  #ifndef __MINGW32__
     if (args.tls)
       fiobj_str_write(url_tmp, "wss://", 6);
     else
+  #endif
       fiobj_str_write(url_tmp, "ws://", 5);
     if (!is_unix_socket) {
       fiobj_str_write(url_tmp, args.address.data, args.address.len);
@@ -1072,11 +1086,19 @@ intptr_t iodine_ws_connect(iodine_connection_args_s args) {
     args.url = fiobj_obj2cstr(url_tmp);
   }
 
+#ifdef __MINGW32__
+  intptr_t uuid = http_connect(
+      args.url.data, (is_unix_socket ? args.address.data : NULL),
+      .udata = request_data_create(&args),
+      .on_response = ws_client_http_connected,
+      .on_finish = ws_client_http_connection_finished);
+#else
   intptr_t uuid = http_connect(
       args.url.data, (is_unix_socket ? args.address.data : NULL),
       .udata = request_data_create(&args),
       .on_response = ws_client_http_connected,
       .on_finish = ws_client_http_connection_finished, .tls = args.tls);
+#endif
   fiobj_free(url_tmp);
   return uuid;
 }

data/ext/iodine/iodine_rack_io.c

@@ -61,6 +61,9 @@ static VALUE TCPSOCKET_CLASS;
 static ID for_fd_id;
 static ID iodine_fd_var_id;
 static ID iodine_new_func_id;
+#ifdef __MINGW32__
+static ID iodine_osffd_id;
+#endif
 static rb_encoding *IodineUTF8Encoding;
 static rb_encoding *IodineBinaryEncoding;
 
@@ -69,7 +72,7 @@ static rb_encoding *IodineBinaryEncoding;
 
 inline static http_s *get_handle(VALUE obj) {
   VALUE i = rb_ivar_get(obj, iodine_fd_var_id);
-  return (http_s *)FIX2ULONG(i);
+  return (http_s *)NUM2ULL(i);
 }
 
 /* *****************************************************************************
@@ -78,7 +81,7 @@ IO API
 
 static inline FIOBJ get_data(VALUE self) {
   VALUE i = rb_ivar_get(self, io_id);
-  return (FIOBJ)FIX2ULONG(i);
+  return (FIOBJ)NUM2ULL(i);
 }
 
 static VALUE rio_rewind(VALUE self) {
@@ -196,7 +199,14 @@ static VALUE rio_get_io(int argc, VALUE *argv, VALUE self) {
   set_handle(self, NULL);
   // hijack the IO object
   intptr_t uuid = http_hijack(h, NULL);
+#ifdef __MINGW32__
+  int osffd = fio_osffd4fd(fio_uuid2fd(uuid));
+  if (osffd == -1)
+    return Qfalse;
+  VALUE fd = INT2FIX(osffd);
+#else
   VALUE fd = INT2FIX(fio_uuid2fd(uuid));
+#endif
   // VALUE new_io = how the fuck do we create a new IO from the fd?
   VALUE new_io = IodineCaller.call2(TCPSOCKET_CLASS, for_fd_id, 1,
                                     &fd); // TCPSocket.for_fd(fd) ... cool...
@@ -238,6 +248,9 @@ static void init_rack_io(void) {
   for_fd_id = rb_intern("for_fd");
   iodine_fd_var_id = rb_intern("fd");
   iodine_new_func_id = rb_intern("new");
+#ifdef __MINGW32__
+  iodine_osffd_id = rb_intern("osffd");
+#endif
   hijack_func_sym = ID2SYM(rb_intern("_hijack"));
 
   TCPSOCKET_CLASS = rb_const_get(rb_cObject, rb_intern("TCPSocket"));

data/ext/iodine/iodine_tcp.c

@@ -209,10 +209,17 @@ Returns the handler object used.
 intptr_t iodine_tcp_listen(iodine_connection_args_s args) {
   // clang-format on
   IodineStore.add(args.handler);
+#ifdef __MINGW32__
+  return fio_listen(.port = args.port.data, .address = args.address.data,
+                    .on_open = iodine_tcp_on_open,
+                    .on_finish = iodine_tcp_on_finish,
+                    .udata = (void *)args.handler);
+#else
   return fio_listen(.port = args.port.data, .address = args.address.data,
                     .on_open = iodine_tcp_on_open,
                     .on_finish = iodine_tcp_on_finish, .tls = args.tls,
                     .udata = (void *)args.handler);
+#endif
 }
 
 // clang-format off
@@ -238,10 +245,17 @@ Returns the handler object used.
 intptr_t iodine_tcp_connect(iodine_connection_args_s args){
   // clang-format on
   IodineStore.add(args.handler);
+#ifdef __MINGW32__
+  return fio_connect(.port = args.port.data, .address = args.address.data,
+                     .on_connect = iodine_tcp_on_connect,
+                     .on_fail = iodine_tcp_on_fail, .timeout = args.ping,
+                     .udata = (void *)args.handler);
+#else
   return fio_connect(.port = args.port.data, .address = args.address.data,
                      .on_connect = iodine_tcp_on_connect, .tls = args.tls,
                      .on_fail = iodine_tcp_on_fail, .timeout = args.ping,
                      .udata = (void *)args.handler);
+#endif
 }
 
 // clang-format off

data/ext/iodine/iodine_tls.c

@@ -1,3 +1,10 @@
+#ifdef __MINGW32__
+// make pedantic compiler happy
+typedef struct {
+  int bogus;
+} bogus_s;
+
+#else
 #include <ruby.h>
 
 #include <fio.h>
@@ -251,3 +258,4 @@ void iodine_init_tls(void) {
 #endif
 }
 #undef IODINE_MAKE_SYM
+#endif

data/ext/iodine/mustache_parser.h

@@ -28,6 +28,10 @@ Feel free to copy, use and enjoy according to the license provided.
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifdef __MINGW32__
+ssize_t pread(int, void*, size_t, off_t);
+#endif
+
 #if !defined(__GNUC__) && !defined(__clang__) && !defined(FIO_GNUC_BYPASS)
 #define __attribute__(...)
 #define __has_include(...) 0

data/ext/iodine/redis_engine.c

@@ -493,6 +493,7 @@ static void redis_pub_ping(intptr_t uuid, fio_protocol_s *pr) {
     return;
   }
   redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + 15);
+  FIO_ASSERT_ALLOC(cmd);
   *cmd = (redis_commands_s){.cmd_len = 14};
   memcpy(cmd->cmd, "*1\r\n$4\r\nPING\r\n\0", 15);
   redis_attach_cmd(r, cmd);
@@ -534,6 +535,7 @@ static void redis_on_connect(intptr_t uuid, void *i_) {
     r = pub2redis(i);
     if (r->auth_len) {
       redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + r->auth_len);
+      FIO_ASSERT_ALLOC(cmd);
       *cmd =
           (redis_commands_s){.cmd_len = r->auth_len, .callback = redis_on_auth};
       memcpy(cmd->cmd, r->auth, r->auth_len);
@@ -638,6 +640,7 @@ static void redis_on_publish_root(const fio_pubsub_engine_s *eng,
                                   uint8_t is_json) {
   redis_engine_s *r = (redis_engine_s *)eng;
   redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + channel.len + msg.len + 96);
+  FIO_ASSERT_ALLOC(cmd);
   *cmd = (redis_commands_s){.cmd_len = 0};
   memcpy(cmd->cmd, "*3\r\n$7\r\nPUBLISH\r\n$", 18);
   char *buf = (char *)cmd->cmd + 18;
@@ -684,7 +687,7 @@ static void redis_on_publish_child(const fio_pubsub_engine_s *eng,
   fio_str_s tmp = FIO_STR_INIT;
   /* by using fio_str_s, short names are allocated on the stack */
   fio_str_info_s tmp_info = fio_str_resize(&tmp, channel.len + 8);
-  fio_u2str64(tmp_info.data, (uint64_t)eng);
+  fio_u2str64(tmp_info.data, (uintptr_t)eng);
   memcpy(tmp_info.data + 8, channel.data, channel.len);
   /* forward publication request to Root */
   fio_publish(.filter = -1, .channel = tmp_info, .message = msg,
@@ -701,7 +704,7 @@ Root Publication Handler
 static void redis_on_internal_publish(fio_msg_s *msg) {
   if (msg->channel.len < 8)
     return; /* internal error, unexpected data */
-  void *en = (void *)fio_str2u64(msg->channel.data);
+  void *en = (void *)(uintptr_t)fio_str2u64(msg->channel.data);
   if (en != msg->udata1)
     return; /* should be delivered by a different engine */
   /* step after the engine data */
@@ -721,8 +724,8 @@ Sending commands using the Root connection
 static void redis_forward_reply(fio_pubsub_engine_s *e, FIOBJ reply,
                                 void *udata) {
   uint8_t *data = udata;
-  fio_pubsub_engine_s *engine = (fio_pubsub_engine_s *)fio_str2u64(data + 0);
-  void *callback = (void *)fio_str2u64(data + 8);
+  fio_pubsub_engine_s *engine = (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(data + 0);
+  void *callback = (void *)(uintptr_t)fio_str2u64(data + 8);
   if (engine != e || !callback) {
     FIO_LOG_DEBUG("Redis reply not forwarded (callback: %p)", callback);
     return;
@@ -738,7 +741,7 @@ static void redis_forward_reply(fio_pubsub_engine_s *e, FIOBJ reply,
 static void redis_on_internal_cmd(fio_msg_s *msg) {
   // void*(void *)fio_str2u64(msg->msg.data);
   fio_pubsub_engine_s *engine =
-      (fio_pubsub_engine_s *)fio_str2u64(msg->channel.data + 0);
+      (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(msg->channel.data + 0);
   if (engine != msg->udata1) {
     return;
   }
@@ -756,7 +759,7 @@ static void redis_on_internal_cmd(fio_msg_s *msg) {
 /* Listens on filter `-10 -getpid()` for incoming reply data */
 static void redis_on_internal_reply(fio_msg_s *msg) {
   fio_pubsub_engine_s *engine =
-      (fio_pubsub_engine_s *)fio_str2u64(msg->channel.data + 0);
+      (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(msg->channel.data + 0);
   if (engine != msg->udata1) {
     FIO_LOG_DEBUG("Redis reply not forwarded (engine mismatch: %p != %p)",
                   (void *)engine, msg->udata1);
@@ -765,8 +768,8 @@ static void redis_on_internal_reply(fio_msg_s *msg) {
   FIOBJ reply;
   fiobj_json2obj(&reply, msg->msg.data, msg->msg.len);
   void (*callback)(fio_pubsub_engine_s *, FIOBJ, void *) = (void (*)(
-      fio_pubsub_engine_s *, FIOBJ, void *))fio_str2u64(msg->channel.data + 8);
-  void *udata = (void *)fio_str2u64(msg->channel.data + 16);
+      fio_pubsub_engine_s *, FIOBJ, void *))(uintptr_t)fio_str2u64(msg->channel.data + 8);
+  void *udata = (void *)(uintptr_t)fio_str2u64(msg->channel.data + 16);
   callback(engine, reply, udata);
   fiobj_free(reply);
 }
@@ -788,9 +791,9 @@ intptr_t redis_engine_send(fio_pubsub_engine_s *engine, FIOBJ command,
   fio_str_s tmp = FIO_STR_INIT;
   fio_str_info_s ti = fio_str_resize(&tmp, 28);
   /* combine metadata */
-  fio_u2str64(ti.data + 0, (uint64_t)engine);
-  fio_u2str64(ti.data + 8, (uint64_t)callback);
-  fio_u2str64(ti.data + 16, (uint64_t)udata);
+  fio_u2str64(ti.data + 0, (uintptr_t)engine);
+  fio_u2str64(ti.data + 8, (uintptr_t)callback);
+  fio_u2str64(ti.data + 16, (uintptr_t)udata);
   fio_u2str32(ti.data + 24, (uint32_t)getpid());
   FIOBJ cmd = fiobj2resp_tmp(command);
   fio_publish(.filter = -2, .channel = ti, .message = fiobj_obj2cstr(cmd),

data/ext/iodine/websockets.c

@@ -17,7 +17,9 @@ Feel free to copy, use and enjoy according to the license provided.
 #include <http.h>
 #include <http_internal.h>
 
+#ifndef __MINGW32__
 #include <arpa/inet.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +28,7 @@ Feel free to copy, use and enjoy according to the license provided.
 
 #include <websocket_parser.h>
 
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) && !defined(__MINGW32__)
 #include <endian.h>
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -71,6 +73,7 @@ struct buffer_s create_ws_buffer(ws_s *owner) {
   struct buffer_s buff;
   buff.size = WS_INITIAL_BUFFER_SIZE;
   buff.data = malloc(buff.size);
+  FIO_ASSERT_ALLOC(buff.data);
   return buff;
 }
 
@@ -79,7 +82,6 @@ struct buffer_s resize_ws_buffer(ws_s *owner, struct buffer_s buff) {
   void *tmp = realloc(buff.data, buff.size);
   if (!tmp) {
     free_ws_buffer(owner, buff);
-    buff.data = NULL;
     buff.size = 0;
   }
   buff.data = tmp;
@@ -174,6 +176,7 @@ static void websocket_on_protocol_ping(void *ws_p, void *msg_, uint64_t len) {
   ws_s *ws = ws_p;
   if (msg_) {
     void *buff = malloc(len + 16);
+    FIO_ASSERT_ALLOC(buff);
     len = (((ws_s *)ws)->is_client
                ? websocket_client_wrap(buff, msg_, len, 10, 1, 1, 0)
                : websocket_server_wrap(buff, msg_, len, 10, 1, 1, 0));
@@ -305,6 +308,7 @@ Create/Destroy the websocket object
 static ws_s *new_websocket(intptr_t uuid) {
   // allocate the protocol object
   ws_s *ws = malloc(sizeof(*ws));
+  FIO_ASSERT_ALLOC(ws);
   *ws = (ws_s){
       .protocol.ping = ws_ping,
       .protocol.on_data = on_data_first,
@@ -330,7 +334,6 @@ static void destroy_ws(ws_s *ws) {
 void websocket_attach(intptr_t uuid, http_settings_s *http_settings,
                       websocket_settings_s *args, void *data, size_t length) {
   ws_s *ws = new_websocket(uuid);
-  FIO_ASSERT_ALLOC(ws);
   // we have an active websocket connection - prep the connection buffer
   ws->buffer = create_ws_buffer(ws);
   // Setup ws callbacks
@@ -383,6 +386,7 @@ static void websocket_write_impl(intptr_t fd, void *data, size_t len, char text,
                                  char first, char last, char client) {
   if (len <= WS_MAX_FRAME_SIZE) {
     void *buff = fio_malloc(len + 16);
+    FIO_ASSERT_ALLOC(buff);
     len = (client ? websocket_client_wrap(buff, data, len, (text ? 1 : 2),
                                           first, last, 0)
                   : websocket_server_wrap(buff, data, len, (text ? 1 : 2),

data/iodine.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Boaz Segev']
   spec.email         = ['bo@plezi.io']
 
-  spec.summary       = 'iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD'
-  spec.description   = 'A fast HTTP / Websocket Server with built-in Pub/Sub support (with or without Redis), static file support and many other features, optimized for Ruby MRI on Linux / BSD / macOS'
+  spec.summary       = 'iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD / Windows'
+  spec.description   = 'A fast HTTP / Websocket Server with built-in Pub/Sub support (with or without Redis), static file support and many other features, optimized for Ruby MRI on Linux / BSD / macOS / Windows'
   spec.homepage      = 'https://github.com/boazsegev/iodine'
   spec.license       = 'MIT'
 
@@ -35,10 +35,11 @@ Gem::Specification.new do |spec|
   spec.requirements << 'An updated C compiler.'
   spec.requirements << 'Ruby >= 2.3.8 (Ruby EOL).'
   spec.requirements << 'Ruby >= 2.5.0 recommended.'
-  spec.requirements << 'TLS requires OpenSSL >= 1.1.0'
+  spec.requirements << 'TLS requires OpenSSL >= 1.1.0.'
+  spec.requirements << 'Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.'
 
   # spec.add_development_dependency 'bundler', '>= 1.10', '< 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0', '< 13.0'
+  spec.add_development_dependency 'rake', '>= 12.0', '< 14.0'
   spec.add_development_dependency 'minitest', '>=5', '< 6.0'
   spec.add_development_dependency 'rspec', '>=3.9.0', '< 4.0'
   spec.add_development_dependency 'spec', '>=5.3.0', '< 6.0'

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.44'.freeze
+  VERSION = '0.7.47'.freeze
 end