iodine 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252241f38288180ae589bbe3787c5214a62cef10
-  data.tar.gz: 39f4936e62585c3f95dc9910de67a82d43093776
+  metadata.gz: fc35ddb10525599dcaacd5746e7ad1b6b5798d25
+  data.tar.gz: abb7a77d1f0e9e224037aea022d3b58964d24459
 SHA512:
-  metadata.gz: c41af300fdffcc3e5721a2c2da23841686b19b1eb6bae2f7c70e3b2bfb954d0182bffa0610846d656b4812ff6abd0b2f678767c908fda305e266cc2b847e2679
-  data.tar.gz: 1f17f2dd33c1a95ab5e4e5e64afbbea417743b7364fb2826a4d628eea9dabf33f71056a9184892c92c063f2ff6df9e86654fa4199da60cfab017b850fe5baabe
+  metadata.gz: 47ae99c46deb8aac630e8b096a0478fb45e1d7aa732f988ca111ebcbc55e13e74fa6c816c27d4f826f89ec0de2ab82b75c0ecf5495a0d560eae54556db6dde87
+  data.tar.gz: 810d41cbe10ca2683eb9d6fadbd02cc66df8c6ae55cf1857be6aae4208e1988884f9b24b8240497d435d4ddd9409f7b30f1f0492a7382c0900c870d8d11651da

data/CHANGELOG.md

@@ -8,9 +8,17 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+Change log v.0.2.8
+
+**Memory Performance**: The Websocket connection Protocol now utilizes both a C level memory pool and a local thread storage for temporary data. This helps mitigate possible memory fragmentation issues related to long running processes and long-lived objects. In addition, the socket `read` buffer was moved from the protocol object to a local thread storage (assumes pthreads and not green threads). This minimizes the memory footprint for each connection (at the expense of memory locality) and should allow Iodine to support more concurrent connections using less system resources. Last, but not least, the default message buffer per connection starts at 4Kb instead of 16Kb (grows as needed, up to `Iodine::Rack.max_msg_size`), assuming smaller messages are the norm.
+
+**Housekeeping**: Cleaned up some code, removed old files, copied over the latest [`facil.io`](http://facil.io) library. There's probably some more housekeeping left to perform, especially anywhere where documentation is concerned. I welcome help with documentation.
+
+***
+
 Change log v.0.2.7
 
-**Minor Fix**: fixed an issue where a negative number or processes or threads would initiate a very large number of forks, promoting a resource choke to the system. limited the number of threads (1023) and processes (127).
+**Minor Fix**: fixed an issue where a negative number of processes or threads would initiate a very large number of forks, promoting a system resource choke. Limited the number of threads (1023) and processes (127).
 
 **Update**: Automated the number of processes (forks) and threads used when these are not explicitly specified. These follow the number of cores / 2.
 

data/README.md

@@ -33,6 +33,8 @@ Using the Iodine server is easy, simply add Iodine as a gem to your Rack applica
 gem 'iodine', :git => 'https://github.com/boazsegev/iodine.git'
 ```
 
+Iodine will calculate, when possible, a good enough default concurrency model for fast applications... this might not fit your application if you use database access or other blocking calls.
+
 To get the most out of Iodine, consider the amount of CPU cores available and the concurrency level the application requires.
 
 Puma's model of 16 threads and 4 processes is easily adopted and proved to provide a good enough balance for most use-cases. Use:
@@ -41,7 +43,9 @@ Puma's model of 16 threads and 4 processes is easily adopted and proved to provi
 bundler exec iodine -p $PORT -t 16 -w 4
 ```
 
-It should be noted that Websocket support means that no automatic process scaling is provided (since Websockets don't share data across processes without your help)... It is important to use `iodine` with the `-w` option and set the number of desired processes (ideally equal to the number of CPU cores).
+It should be noted that automatic process scaling will cause issues with Websocket broadcast (`each`) support, ssince the `Websocket#each` method will be limited to the calling process (other clients might be connected to a different process.
+
+I recommended that you consider using Redis to scale Websocket "events" across processes / machines. look into [plezi.io](http://www.plezi.io) for automatic Websocket scaling with Redis and Iodine.
 
 ### Writing data to the network layer
 

data/ext/iodine/base64.c

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */

data/ext/iodine/base64.h

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */

data/ext/iodine/bscrypt-common.h

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */
@@ -11,9 +11,9 @@ Feel free to copy, use and enjoy in accordance with to the license(s).
 Environment - you can safely ignore this part... probably.
 */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <time.h>
 
@@ -26,7 +26,7 @@ Environment - you can safely ignore this part... probably.
 #ifdef __has_include
 
 /* check for unix support */
-#if __has_include(<unistd.h>)&&__has_include(<pthread.h>)
+#if __has_include(<unistd.h>) && __has_include(<pthread.h>)
 #define HAS_UNIX_FEATURES
 #endif
 

data/ext/iodine/bscrypt.h

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */
@@ -20,8 +20,8 @@ All functions will be available using the prefix `bscrypt_`, i.e.:
 */
 #define BSCRYPT "0.0.1"
 
-#include "bscrypt-common.h"
 #include "base64.h"
+#include "bscrypt-common.h"
 #include "hex.h"
 #include "misc.h"
 #include "random.h"

data/ext/iodine/hex.c

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */
@@ -24,13 +24,14 @@ Hex Conversion
 
 /* Credit to Jonathan Leffler for the idea */
 #define hex2i(c)                                                               \
-  (((c) >= '0' && (c) <= '9') ? ((c)-48) : (((c) >= 'a' && (c) <= 'f') ||      \
-                                            ((c) >= 'A' && (c) <= 'F'))        \
-                                               ? (((c) | 32) - 87)             \
-                                               : ({                            \
-                                                   return -1;                  \
-                                                   0;                          \
-                                                 }))
+  (((c) >= '0' && (c) <= '9')                                                  \
+       ? ((c)-48)                                                              \
+       : (((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))            \
+             ? (((c) | 32) - 87)                                               \
+             : ({                                                              \
+                 return -1;                                                    \
+                 0;                                                            \
+               }))
 
 /**
 Returns 1 if the string is HEX encoded (no non-valid hex values). Returns 0 if

data/ext/iodine/hex.h

@@ -1,7 +1,7 @@
 /*
-(un)copyright: Boaz segev, 2016
-License: Public Domain except for any non-public-domain algorithms, which are
-subject to their own licenses.
+Copyright: Boaz segev, 2016-2017
+License: MIT except for any non-public-domain algorithms (none that I'm aware
+of), which might be subject to their own licenses.
 
 Feel free to copy, use and enjoy in accordance with to the license(s).
 */

data/ext/iodine/http.c

@@ -1,3 +1,9 @@
+/*
+copyright: Boaz segev, 2016-2017
+license: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "http.h"
 
 /**
@@ -7,14 +13,14 @@ See the libc `gmtime_r` documentation for details.
 
 Falls back to `gmtime_r` for dates before epoch.
 */
-struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf) {
+struct tm *http_gmtime(const time_t *timer, struct tm *tmbuf) {
   // static char* DAYS[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
   // static char * Months = {  "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   // "Jul",
   // "Aug", "Sep", "Oct", "Nov", "Dec"};
   static uint8_t month_len[] = {
-      31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,  // nonleap year
-      31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31   // leap year
+      31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, // nonleap year
+      31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31  // leap year
   };
   if (*timer < 0)
     return gmtime_r(timer, tmbuf);
@@ -22,7 +28,7 @@ struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf) {
   tmbuf->tm_gmtoff = 0;
   tmbuf->tm_zone = "UTC";
   tmbuf->tm_isdst = 0;
-  tmbuf->tm_year = 70;  // tm_year == The number of years since 1900
+  tmbuf->tm_year = 70; // tm_year == The number of years since 1900
   tmbuf->tm_mon = 0;
   // for seconds up to weekdays, we build up, as small values clean up larger
   // values.
@@ -47,7 +53,7 @@ struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf) {
     tmbuf->tm_year += 100;
     tmp -= DAYS_PER_100_YEARS;
     if (((tmbuf->tm_year / 100) & 3) ==
-        0)  // leap century divisable by 400 => add leap
+        0) // leap century divisable by 400 => add leap
       --tmp;
   }
 #undef DAYS_PER_100_YEARS
@@ -72,7 +78,7 @@ struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf) {
   while (tmp >= 365) {
     tmbuf->tm_year += 1;
     tmp -= 365;
-    if ((tmbuf->tm_year & 3) == 0) {  // leap year
+    if ((tmbuf->tm_year & 3) == 0) { // leap year
       if (tmp > 0) {
         --tmp;
         continue;
@@ -105,15 +111,15 @@ struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf) {
   return tmbuf;
 }
 
-static char* DAY_NAMES[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-static char* MONTH_NAMES[] = {"Jan ", "Feb ", "Mar ", "Apr ", "May ", "Jun ",
+static char *DAY_NAMES[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+static char *MONTH_NAMES[] = {"Jan ", "Feb ", "Mar ", "Apr ", "May ", "Jun ",
                               "Jul ", "Aug ", "Sep ", "Oct ", "Nov ", "Dec "};
-static const char* GMT_STR = "GMT";
+static const char *GMT_STR = "GMT";
 
-size_t http_date2str(char* target, struct tm* tmbuf) {
-  char* pos = target;
+size_t http_date2str(char *target, struct tm *tmbuf) {
+  char *pos = target;
   uint16_t tmp;
-  *(uint32_t*)pos = *((uint32_t*)DAY_NAMES[tmbuf->tm_wday]);
+  *(uint32_t *)pos = *((uint32_t *)DAY_NAMES[tmbuf->tm_wday]);
   pos[3] = ',';
   pos[4] = ' ';
   pos += 5;
@@ -127,7 +133,7 @@ size_t http_date2str(char* target, struct tm* tmbuf) {
     pos += 2;
   }
   *(pos++) = ' ';
-  *(uint32_t*)pos = *((uint32_t*)MONTH_NAMES[tmbuf->tm_mon]);
+  *(uint32_t *)pos = *((uint32_t *)MONTH_NAMES[tmbuf->tm_mon]);
   pos += 4;
   // write year.
   pos += http_ul2a(pos, tmbuf->tm_year + 1900);
@@ -145,23 +151,24 @@ size_t http_date2str(char* target, struct tm* tmbuf) {
   pos[7] = '0' + (tmbuf->tm_sec - (tmp * 10));
   pos += 8;
   pos[0] = ' ';
-  *((uint32_t*)(pos + 1)) = *((uint32_t*)GMT_STR);
+  *((uint32_t *)(pos + 1)) = *((uint32_t *)GMT_STR);
   pos += 4;
   return pos - target;
 }
 
 /* Credit to Jonathan Leffler for the idea of a unified conditional */
-#define hex_val(c)                                                        \
-  (((c) >= '0' && (c) <= '9') ? ((c)-48) : (((c) >= 'a' && (c) <= 'f') || \
-                                            ((c) >= 'A' && (c) <= 'F'))   \
-                                               ? (((c) | 32) - 87)        \
-                                               : ({                       \
-                                                   return -1;             \
-                                                   0;                     \
-                                                 }))
-ssize_t http_decode_url(char* dest, const char* url_data, size_t length) {
-  char* pos = dest;
-  const char* end = url_data + length;
+#define hex_val(c)                                                             \
+  (((c) >= '0' && (c) <= '9')                                                  \
+       ? ((c)-48)                                                              \
+       : (((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))            \
+             ? (((c) | 32) - 87)                                               \
+             : ({                                                              \
+                 return -1;                                                    \
+                 0;                                                            \
+               }))
+ssize_t http_decode_url(char *dest, const char *url_data, size_t length) {
+  char *pos = dest;
+  const char *end = url_data + length;
   while (url_data < end) {
     if (*url_data == '+') {
       // decode space
@@ -179,8 +186,8 @@ ssize_t http_decode_url(char* dest, const char* url_data, size_t length) {
   return pos - dest;
 }
 
-ssize_t http_decode_url_unsafe(char* dest, const char* url_data) {
-  char* pos = dest;
+ssize_t http_decode_url_unsafe(char *dest, const char *url_data) {
+  char *pos = dest;
   while (*url_data) {
     if (*url_data == '+') {
       // decode space

data/ext/iodine/http.h

@@ -1,14 +1,21 @@
+/*
+copyright: Boaz segev, 2016-2017
+license: MIT
 
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP_H
 #define HTTP_H
 
 /* *****************************************************************************
 Core include files
 */
+// clang-format off
 #include "libserver.h"
+#include <time.h>
 #include "http_request.h"
 #include "http_response.h"
-#include <time.h>
+// clang-format on
 /* *****************************************************************************
 Hard Coded Settings
 */
@@ -37,12 +44,12 @@ typedef struct {
   */
   size_t max_body_size;
   /** the callback to be performed when requests come in. */
-  void (*on_request)(http_request_s* request);
+  void (*on_request)(http_request_s *request);
   /**
   A public folder for file transfers - allows to circumvent any application
   layer server and simply serve files.
   */
-  const char* public_folder;
+  const char *public_folder;
   /**
   The length of the public_folder string.
   */
@@ -72,7 +79,7 @@ See the libc `gmtime_r` documentation for details.
 
 Falls back to `gmtime_r` for dates before epoch.
 */
-struct tm* http_gmtime(const time_t* timer, struct tm* tmbuf);
+struct tm *http_gmtime(const time_t *timer, struct tm *tmbuf);
 
 /**
 Writes an HTTP date string to the `target` buffer.
@@ -81,7 +88,7 @@ This requires _____ bytes of space to be available at the target buffer.
 
 Returns the number of bytes actually written.
 */
-size_t http_date2str(char* target, struct tm* tmbuf);
+size_t http_date2str(char *target, struct tm *tmbuf);
 
 /**
 A fast, inline alternative to `sprintf(dest, "%lu", num)`.
@@ -93,7 +100,7 @@ A NULL terminating byte is written.
 
 Returns the number of bytes actually written (excluding the NULL byte).
 */
-inline size_t http_ul2a(char* dest, size_t num) {
+inline size_t http_ul2a(char *dest, size_t num) {
   uint8_t digits = 1;
   size_t tmp = num;
   while ((tmp /= 10))
@@ -110,10 +117,10 @@ inline size_t http_ul2a(char* dest, size_t num) {
 }
 
 /** Decodes a URL encoded string, no buffer overflow protection. */
-ssize_t http_decode_url_unsafe(char* dest, const char* url_data);
+ssize_t http_decode_url_unsafe(char *dest, const char *url_data);
 
 /** Decodes a URL encoded string. */
-ssize_t http_decode_url(char* dest, const char* url_data, size_t length);
+ssize_t http_decode_url(char *dest, const char *url_data, size_t length);
 
 /* *****************************************************************************
 HTTP versions (they depend on the settings / core data structure)

data/ext/iodine/http1.c

@@ -1,11 +1,17 @@
+/*
+copyright: Boaz segev, 2016-2017
+license: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "http1.h"
+#include "errno.h"
 #include "http1_simple_parser.h"
-#include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include "errno.h"
+#include <stdio.h>
+#include <string.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 
 /* *****************************************************************************
 HTTP/1.1 data structure
@@ -13,23 +19,23 @@ HTTP/1.1 data structure
 
 typedef struct {
   protocol_s protocol;
-  http_settings_s* settings;
+  http_settings_s *settings;
   char buffer[HTTP1_MAX_HEADER_SIZE];
   size_t buffer_pos;
-  void (*on_request)(http_request_s* request);
+  void (*on_request)(http_request_s *request);
   http_request_s
       request; /* MUST be last, as it has memory extensions for the headers*/
 } http1_protocol_s; /* ~ 8416 bytes for (8 * 1024) buffer size and 64 headers */
 
-#define HTTP1_PROTOCOL_SIZE \
+#define HTTP1_PROTOCOL_SIZE                                                    \
   (sizeof(http1_protocol_s) + HTTP_REQUEST_SIZE(HTTP1_MAX_HEADER_COUNT))
 
-char* HTTP1 = "http1";
+char *HTTP1 = "http1";
 
 /* *****************************************************************************
 HTTP/1.1 callbacks
 */
-static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol);
+static void http1_on_data(intptr_t uuid, http1_protocol_s *protocol);
 
 /* *****************************************************************************
 HTTP/1.1 protocol pooling
@@ -38,13 +44,13 @@ HTTP/1.1 protocol pooling
 #define HTTP1_POOL_MEMORY_SIZE (HTTP1_PROTOCOL_SIZE * HTTP1_POOL_SIZE)
 
 struct {
-  void* memory;
-  http1_protocol_s* pool;
+  void *memory;
+  http1_protocol_s *pool;
   spn_lock_i lock;
 } http1_pool = {0};
 
-inline static http1_protocol_s* pool_pop() {
-  http1_protocol_s* prot;
+inline static http1_protocol_s *pool_pop() {
+  http1_protocol_s *prot;
   spn_lock(&http1_pool.lock);
   prot = http1_pool.pool;
   if (prot)
@@ -53,7 +59,7 @@ inline static http1_protocol_s* pool_pop() {
   return prot;
 }
 
-inline static void pool_push(http1_protocol_s* protocol) {
+inline static void pool_push(http1_protocol_s *protocol) {
   if (protocol == NULL)
     return;
   spn_lock(&http1_pool.lock);
@@ -83,7 +89,7 @@ static void http1_init(void) {
     atexit(http1_cleanup);
 
     // initialize pool
-    void* pos = http1_pool.memory;
+    void *pos = http1_pool.memory;
     while (pos <
            http1_pool.memory + (HTTP1_POOL_MEMORY_SIZE - HTTP1_PROTOCOL_SIZE)) {
       pool_push(pos);
@@ -94,30 +100,30 @@ static void http1_init(void) {
 }
 
 /** initializes the library if it wasn't already initialized. */
-#define validate_mem()             \
-  {                                \
-    if (http1_pool.memory == NULL) \
-      http1_init();                \
+#define validate_mem()                                                         \
+  {                                                                            \
+    if (http1_pool.memory == NULL)                                             \
+      http1_init();                                                            \
   }
 
-inline static void http1_free(http1_protocol_s* http) {
+inline static void http1_free(http1_protocol_s *http) {
   http_request_clear(&http->request);
   validate_mem();
-  if (((void*)http) >= http1_pool.memory &&
-      ((void*)http) <= (http1_pool.memory + HTTP1_POOL_MEMORY_SIZE)) {
+  if (((void *)http) >= http1_pool.memory &&
+      ((void *)http) <= (http1_pool.memory + HTTP1_POOL_MEMORY_SIZE)) {
     pool_push(http);
   } else
     free(http);
 }
 
-protocol_s* http1_alloc(intptr_t fd, http_settings_s* settings) {
+protocol_s *http1_alloc(intptr_t fd, http_settings_s *settings) {
   validate_mem();
   // HTTP/1.1 should send a busy response
   // if there aren't enough available file descriptors.
   if (sock_max_capacity() - sock_uuid2fd(fd) <= HTTP_BUSY_UNLESS_HAS_FDS)
     goto is_busy;
   // get an http object from the pool
-  http1_protocol_s* http = pool_pop();
+  http1_protocol_s *http = pool_pop();
   // of malloc one
   if (http == NULL)
     http = malloc(HTTP1_PROTOCOL_SIZE);
@@ -133,8 +139,8 @@ protocol_s* http1_alloc(intptr_t fd, http_settings_s* settings) {
   // setup protocol callbacks
   http->protocol = (protocol_s){
       .service = HTTP1,
-      .on_data = (void (*)(intptr_t, protocol_s*))http1_on_data,
-      .on_close = (void (*)(protocol_s*))http1_free,
+      .on_data = (void (*)(intptr_t, protocol_s *))http1_on_data,
+      .on_close = (void (*)(protocol_s *))http1_free,
   };
   // setup request data
   http->request = (http_request_s){
@@ -147,7 +153,7 @@ protocol_s* http1_alloc(intptr_t fd, http_settings_s* settings) {
   http->on_request = settings->on_request;
   // set the timeout
   server_set_timeout(fd, settings->timeout);
-  return (protocol_s*)http;
+  return (protocol_s *)http;
 
 is_busy:
   if (settings->public_folder && settings->public_folder_length) {
@@ -168,13 +174,12 @@ is_busy:
     int file = open(fname, O_RDONLY);
     if (file == -1)
       goto busy_no_file;
-    sock_packet_s* packet;
+    sock_packet_s *packet;
     packet = sock_checkout_packet();
-    memcpy(packet->buffer,
-           "HTTP/1.1 503 Service Unavailable\r\n"
-           "Content-Type: text/html\r\n"
-           "Connection: close\r\n"
-           "Content-Length: ",
+    memcpy(packet->buffer, "HTTP/1.1 503 Service Unavailable\r\n"
+                           "Content-Type: text/html\r\n"
+                           "Connection: close\r\n"
+                           "Content-Length: ",
            94);
     p_len = 94 + http_ul2a(packet->buffer + 94, file_data.st_size);
     memcpy(packet->buffer + p_len, "\r\n\r\n", 4);
@@ -196,9 +201,8 @@ is_busy:
     return NULL;
   }
 busy_no_file:
-  sock_write(fd,
-             "HTTP/1.1 503 Service Unavailable\r\nContent-Length: "
-             "13\r\n\r\nServer Busy.",
+  sock_write(fd, "HTTP/1.1 503 Service Unavailable\r\nContent-Length: "
+                 "13\r\n\r\nServer Busy.",
              68);
   return NULL;
 }
@@ -207,15 +211,15 @@ busy_no_file:
 HTTP/1.1 protocol bare-bones implementation
 */
 
-#define HTTP_BODY_CHUNK_SIZE 3072  // 4096
+#define HTTP_BODY_CHUNK_SIZE 3072 // 4096
 
 /* parse and call callback */
-static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
+static void http1_on_data(intptr_t uuid, http1_protocol_s *protocol) {
   ssize_t len = 0;
   ssize_t result;
   char buff[HTTP_BODY_CHUNK_SIZE];
-  char* buffer;
-  http_request_s* request = &protocol->request;
+  char *buffer;
+  http_request_s *request = &protocol->request;
   for (;;) {
     // handle requests with no file data
     if (request->body_file <= 0) {
@@ -235,7 +239,7 @@ static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
       result =
           http1_parse_request_headers(buffer, protocol->buffer_pos, request);
       // review result
-      if (result >= 0) {  // headers comeplete
+      if (result >= 0) { // headers comeplete
         // mark buffer position, for HTTP pipelining
         protocol->buffer_pos = result;
         // are we done?
@@ -251,10 +255,10 @@ static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
         if (result >= 0) {
           protocol->buffer_pos += result;
           goto handle_request;
-        } else if (result == -1)  // parser error
+        } else if (result == -1) // parser error
           goto parser_error;
         goto parse_body;
-      } else if (result == -1)  // parser error
+      } else if (result == -1) // parser error
         goto parser_error;
       // assume incomplete (result == -2), even if wrong, we're right.
       len = 0;
@@ -272,9 +276,9 @@ static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
         // set buffer pos for piplining support
         protocol->buffer_pos = result;
         goto handle_request;
-      } else if (result == -1)  // parser error
+      } else if (result == -1) // parser error
         goto parser_error;
-      if (len < HTTP_BODY_CHUNK_SIZE)  // pause parser for more data
+      if (len < HTTP_BODY_CHUNK_SIZE) // pause parser for more data
         return;
       goto parse_body;
     }
@@ -283,10 +287,10 @@ static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
     // review required headers / data
     if (request->host == NULL)
       goto bad_request;
-    http_settings_s* settings = protocol->settings;
+    http_settings_s *settings = protocol->settings;
     // call request callback
     if (protocol && settings &&
-        (protocol->settings->public_folder == NULL ||
+        (settings->public_folder == NULL ||
          http_response_sendfile2(NULL, request, settings->public_folder,
                                  settings->public_folder_length, request->path,
                                  request->path_len, settings->log_static))) {
@@ -308,7 +312,7 @@ static void http1_on_data(intptr_t uuid, http1_protocol_s* protocol) {
   // no routes lead here.
   fprintf(stderr,
           "I am lost on a deserted island, no code can reach me here :-)\n");
-  return;  // How did we get here?
+  return; // How did we get here?
 parser_error:
   if (request->headers_count == request->metadata.max_headers)
     goto too_big;
@@ -353,7 +357,7 @@ HTTP/1.1 listenning API implementation
 
 #undef http1_listen
 
-static void http1_on_init(http_settings_s* settings) {
+static void http1_on_init(http_settings_s *settings) {
   if (settings->timeout == 0)
     settings->timeout = 5;
   if (settings->max_body_size == 0)
@@ -362,29 +366,28 @@ static void http1_on_init(http_settings_s* settings) {
     settings->public_folder_length = strlen(settings->public_folder);
     if (settings->public_folder[0] == '~' &&
         settings->public_folder[1] == '/' && getenv("HOME")) {
-      char* home = getenv("HOME");
+      char *home = getenv("HOME");
       size_t home_len = strlen(home);
-      char* tmp = malloc(settings->public_folder_length + home_len + 1);
+      char *tmp = malloc(settings->public_folder_length + home_len + 1);
       memcpy(tmp, home, home_len);
       if (home[home_len - 1] == '/')
         --home_len;
       memcpy(tmp + home_len, settings->public_folder + 1,
-             settings->public_folder_length);  // copy also the NULL
+             settings->public_folder_length); // copy also the NULL
       settings->public_folder = tmp;
       settings->private_metaflags |= 1;
       settings->public_folder_length = strlen(settings->public_folder);
     }
   }
 }
-static void http1_on_finish(http_settings_s* settings) {
+static void http1_on_finish(http_settings_s *settings) {
   if (settings->private_metaflags & 1)
-    free((void*)settings->public_folder);
+    free((void *)settings->public_folder);
   if (settings->private_metaflags & 2)
     free(settings);
 }
 
-int http1_listen(const char* port,
-                 const char* address,
+int http1_listen(const char *port, const char *address,
                  http_settings_s settings) {
   if (settings.on_request == NULL) {
     fprintf(
@@ -392,11 +395,11 @@ int http1_listen(const char* port,
         "ERROR: http1_listen requires the .on_request parameter to be set\n");
     exit(11);
   }
-  http_settings_s* settings_copy = malloc(sizeof(*settings_copy));
+  http_settings_s *settings_copy = malloc(sizeof(*settings_copy));
   *settings_copy = settings;
   settings_copy->private_metaflags = 2;
   return server_listen(.port = port, .address = address,
-                       .on_start = (void*)http1_on_init,
-                       .on_finish = (void*)http1_on_finish,
-                       .on_open = (void*)http1_alloc, .udata = settings_copy);
+                       .on_start = (void *)http1_on_init,
+                       .on_finish = (void *)http1_on_finish,
+                       .on_open = (void *)http1_alloc, .udata = settings_copy);
 }