iodine 0.2.7 → 0.2.8

data/ext/iodine/http1.h

@@ -1,3 +1,9 @@
+/*
+copyright: Boaz segev, 2016-2017
+license: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP1_H
 #define HTTP1_H
 
@@ -26,7 +32,7 @@ Any concurrent HTTP1 connections over this amount will be dynamically allocated.
 #define HTTP1_POOL_SIZE (64) /* should be ~0.5Mb with default values*/
 #endif
 
-extern char* HTTP1;
+extern char *HTTP1;
 
 /**
 Allocates memory for an HTTP/1.1 protocol.
@@ -35,17 +41,16 @@ The protocol self destructs when the `on_close` callback is called.
 
 To free the protocol manually, it's possible to call it's `on_close` callback.
 */
-protocol_s* http1_alloc(intptr_t fd, http_settings_s* settings);
+protocol_s *http1_alloc(intptr_t fd, http_settings_s *settings);
 
 /**
 Listens for incoming HTTP/1.1 connections on the specified posrt and address,
 implementing the requested settings.
 */
-int http1_listen(const char* port,
-                 const char* address,
+int http1_listen(const char *port, const char *address,
                  http_settings_s settings);
 
-#define http1_listen(port, address, ...) \
+#define http1_listen(port, address, ...)                                       \
   http1_listen((port), (address), (http_settings_s){__VA_ARGS__})
 
 #endif

data/ext/iodine/http1_simple_parser.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 "http1_simple_parser.h"
 #include <strings.h>
 

data/ext/iodine/http1_simple_parser.h

@@ -1,3 +1,9 @@
+/*
+copyright: Boaz segev, 2016-2017
+license: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP1_SIMPLE_PARSER_H
 #define HTTP1_SIMPLE_PARSER_H
 #include "http_request.h"
@@ -30,9 +36,8 @@ attempt, only the `len` argument is expected to grow.
 The buffer should be kept intact for the life of the request object, as the
 HTTP/1.1 parser does NOT copy any data.
 */
-ssize_t http1_parse_request_headers(void* buffer,
-                                    size_t len,
-                                    http_request_s* request);
+ssize_t http1_parse_request_headers(void *buffer, size_t len,
+                                    http_request_s *request);
 
 /**
 Parses HTTP request body content (if any).
@@ -48,9 +53,8 @@ recycled).
 It is expected that the next attempt will contain fresh data in the `buffer`
 argument.
 */
-ssize_t http1_parse_request_body(void* buffer,
-                                 size_t len,
-                                 http_request_s* request);
+ssize_t http1_parse_request_body(void *buffer, size_t len,
+                                 http_request_s *request);
 
 #if defined(DEBUG) && DEBUG == 1
 void http_parser_test(void);

data/ext/iodine/http_request.h

@@ -1,3 +1,9 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP_REQUEST_H
 #define HTTP_REQUEST_H
 
@@ -5,41 +11,42 @@
 #define _GNU_SOURCE
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdint.h>
-#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <strings.h>
+#include <unistd.h>
 
 #ifndef __unused
 #define __unused __attribute__((unused))
 #endif
 
 typedef struct {
-  const char* name;
-  const char* value;
+  const char *name;
+  const char *value;
   uint16_t name_length;
   uint16_t value_length;
 } http_headers_s;
 
 typedef struct {
   /** points to the HTTP method name. */
-  const char* method;
+  const char *method;
   /** The portion of the request URL that comes before the '?', if any. */
-  const char* path;
+  const char *path;
   /** The string length of the path (editing the path requires update). */
   /** The portion of the request URL that follows the ?, if any. */
-  const char* query;
+  const char *query;
   /** Points to a version string. */
-  const char* version;
+  const char *version;
   /** Points to the body's host header value (a required header). */
-  const char* host;
+  const char *host;
   /** points to the body's content type header, if any. */
-  const char* content_type;
+  const char *content_type;
   /** points to the Upgrade header, if any. */
-  const char* upgrade;
+  const char *upgrade;
   /** points to the Connection header, if any. */
-  const char* connection;
+  const char *connection;
 
   /** the body's content's length, in bytes (can be 0). */
   size_t content_length;
@@ -59,7 +66,7 @@ typedef struct {
   /**
   Points the body of the request, if the body exists and is stored in memory.
   Otherwise, NULL. */
-  const char* body_str;
+  const char *body_str;
   /** points a tmpfile file descriptor containing the body of the request. */
   int body_file;
   /** semi-private information. */
@@ -69,11 +76,11 @@ typedef struct {
     In other times it may contain arbitrary data that can be used by the parser
     or implementation.
     */
-    void* next;
+    void *next;
     /**
     Implementation specific. This, conceptually, holds information about the
     "owner" of this request. */
-    void* owner;
+    void *owner;
     /**
     Implementation specific. This, conceptually, holds the connection that
     "owns" this request, or an implementation identifier. */
@@ -90,7 +97,7 @@ typedef struct {
   http_headers_s headers[];
 } http_request_s;
 
-__unused static inline void http_request_clear(http_request_s* request) {
+__unused static inline void http_request_clear(http_request_s *request) {
   if (request->body_file > 0) /* assumes no tempfile with fd 0 */
     close(request->body_file);
   *request = (http_request_s){
@@ -102,10 +109,9 @@ __unused static inline void http_request_clear(http_request_s* request) {
 
 /** searches for a header in the header array, both reaturnning it's value and
  * setting it's position in the `request->metadata.header_pos` variable.*/
-__unused static inline const char* http_request_find_header(
-    http_request_s* request,
-    const char* header,
-    size_t header_len) {
+__unused static inline const char *
+http_request_find_header(http_request_s *request, const char *header,
+                         size_t header_len) {
   if (header == NULL || request == NULL)
     return NULL;
   if (header_len == 0)
@@ -122,7 +128,7 @@ __unused static inline const char* http_request_find_header(
   return NULL;
 }
 
-#define HTTP_REQUEST_SIZE(header_count) \
+#define HTTP_REQUEST_SIZE(header_count)                                        \
   (sizeof(http_request_s) + ((header_count) * sizeof(http_headers_s)))
 
 #endif

data/ext/iodine/http_response.c

@@ -1,16 +1,29 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+// clang-format off
+#include "http_response_http1.h"
+// clang-format on
+
+#include "base64.h"
 #include "http.h"
 #include "siphash.h"
-#include "base64.h"
-#include "http_response_http1.h"
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <sys/resource.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <time.h>
-#include <sys/resource.h>
 
 /* *****************************************************************************
 Helpers
@@ -418,7 +431,6 @@ void http_response_log_start(http_response_s *response) {
 prints out the log to stderr.
 */
 void http_response_log_finish(http_response_s *response) {
-  // TODO optimize using fwrite
   http_request_s *request = response->metadata.request;
   uintptr_t bytes_sent = (uintptr_t)response->metadata.headers_pos;
 
@@ -431,6 +443,9 @@ void http_response_log_finish(http_response_s *response) {
   socklen_t addrlen = sizeof(addrinfo);
   time_t last_tick = server_last_tick();
   http_gmtime(&last_tick, &tm);
+
+  // TODO Guess IP address from headers (forwarded) where possible
+
   int got_add = getpeername(sock_uuid2fd(request->metadata.fd),
                             (struct sockaddr *)&addrinfo, &addrlen);
 #define HTTP_REQUEST_LOG_LIMIT 128

data/ext/iodine/http_response.h

@@ -1,3 +1,9 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP_RESPONSE
 /**
 The HttpResponse library

data/ext/iodine/http_response_http1.h

@@ -1,8 +1,16 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef HTTP1_RESPONSE_FORMATTER
 #define HTTP1_RESPONSE_FORMATTER
 
-#include "http_response.h"
+// clang-format off
 #include "libsock.h"
+#include "http_response.h"
+// clang-format on
 
 #ifndef __unused
 #define __unused __attribute__((unused))

data/ext/iodine/iodine_core.c

@@ -1,6 +1,11 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #include "iodine_core.h"
 #include "iodine_http.h"
-#include <ruby/io.h>
 
 /* *****************************************************************************
 Core data

data/ext/iodine/iodine_core.h

@@ -1,18 +1,25 @@
 /*
-copyright: Boaz segev, 2016
-license: MIT
+Copyright: Boaz segev, 2016-2017
+License: MIT
 
 Feel free to copy, use and enjoy according to the license provided.
 */
 #ifndef IODINE_CORE_H
 #define IODINE_CORE_H
-#include "rb-registry.h"
-#include "rb-call.h"
-#include "libserver.h"
+// clang-format off
 #include <ruby.h>
-#include <ruby/thread.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <ruby/encoding.h>
+#include <ruby/thread.h>
 #include <ruby/version.h>
+#include <ruby/io.h>
+// clang-format on
+
+#include "libserver.h"
+#include "rb-call.h"
+#include "rb-registry.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

data/ext/iodine/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 "iodine_http.h"
 #include "iodine_websocket.h"
 #include "websockets.h"

data/ext/iodine/iodine_http.h

@@ -1,3 +1,9 @@
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
 #ifndef IODINE_HTTP_H
 #define IODINE_HTTP_H
 #include "iodine_core.h"

data/ext/iodine/iodine_websocket.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 "iodine_websocket.h"
 #include "iodine_core.h"
 #include "iodine_http.h"
@@ -56,8 +62,8 @@ struct buffer_s resize_ws_buffer(ws_s *owner, struct buffer_s);
 /** releases an existing buffer. */
 void free_ws_buffer(ws_s *owner, struct buffer_s);
 
-/** Sets the initial buffer size. (16Kb)*/
-#define WS_INITIAL_BUFFER_SIZE 16384
+/** Sets the initial buffer size. (4Kb)*/
+#define WS_INITIAL_BUFFER_SIZE 4096
 
 // buffer increments by 4,096 Bytes (4Kb)
 #define round_up_buffer_size(size) ((((size) >> 12) + 1) << 12)
@@ -100,7 +106,10 @@ struct buffer_s resize_ws_buffer(ws_s *owner, struct buffer_s buffer) {
   RubyCaller.call_c(ruby_land_buffer, &args);
   return args.buffer;
 }
-void free_ws_buffer(ws_s *owner, struct buffer_s buff) {}
+void free_ws_buffer(ws_s *owner, struct buffer_s buff) {
+  (void)(owner);
+  (void)(buff);
+}
 
 #undef round_up_buffer_size
 
@@ -177,6 +186,7 @@ Websocket defer
 
 static void iodine_perform_defer(intptr_t uuid, protocol_s *protocol,
                                  void *arg) {
+  (void)(uuid);
   VALUE obj = protocol->service == WEBSOCKET_ID_STR
                   ? get_handler(protocol)
                   : dyn_prot(protocol)->handler;
@@ -184,6 +194,7 @@ static void iodine_perform_defer(intptr_t uuid, protocol_s *protocol,
   Registry.remove((VALUE)arg);
 }
 static void iodine_defer_fallback(intptr_t uuid, void *arg) {
+  (void)(uuid);
   Registry.remove((VALUE)arg);
 };
 
@@ -234,12 +245,15 @@ Websocket task performance
 
 static void iodine_ws_perform_each_task(intptr_t fd, protocol_s *protocol,
                                         void *data) {
+  (void)(fd);
   VALUE handler = get_handler(protocol);
   if (handler)
     RubyCaller.call2((VALUE)data, call_proc_id, 1, &handler);
 }
 static void iodine_ws_finish_each_task(intptr_t fd, protocol_s *protocol,
                                        void *data) {
+  (void)(fd);
+  (void)(protocol);
   Registry.remove((VALUE)data);
 }
 
@@ -315,6 +329,7 @@ sucessful event registration doesn't guaranty that the block will be called (the
 connection might close between the event registration and the execution).
 */
 static VALUE iodine_class_defer(VALUE self, VALUE ws_uuid) {
+  (void)(self);
   intptr_t fd = FIX2LONG(ws_uuid);
   if (!sock_isvalid(fd))
     return Qfalse;
@@ -358,6 +373,7 @@ void ws_on_ready(ws_s *ws) {
   RubyCaller.call(handler, on_ready_func_id);
 }
 void ws_on_data(ws_s *ws, char *data, size_t length, uint8_t is_text) {
+  (void)(data);
   VALUE handler = get_handler(ws);
   if (!handler)
     return;
@@ -411,7 +427,10 @@ void iodine_websocket_upgrade(http_request_s *request,
 
 /**  Please implement your own callback for this event.
  */
-static VALUE empty_func(VALUE self) { return Qnil; }
+static VALUE empty_func(VALUE self) {
+  (void)(self);
+  return Qnil;
+}
 // /* The `on_message(data)` callback is the main method for any websocket
 // implementation. It is the only required callback for a websocket handler
 // (without this handler, errors will occur).

data/ext/iodine/iodine_websocket.h

@@ -1,6 +1,6 @@
 /*
-copyright: Boaz segev, 2016
-license: MIT
+Copyright: Boaz segev, 2016-2017
+License: MIT
 
 Feel free to copy, use and enjoy according to the license provided.
 */