0.2.0 update

- added `wic_on_buffer_fn` callback for allocating a transmit buffer
  and indicating when socket is not able to buffer
- added buffer type field to `wic_on_buffer_fn` and `wic_on_send_fn`
  to support buffer prioritisation (i.e. so a pong doesn't disappear)
- added `wic_on_handshake_failure_fn` callback to indicate a failed
handshake
- added `wic_on_close_transport_fn` callback as a dedicated handler for
  closing the transport
- added `wic_on_ping_fn` callback
- added `wic_on_pong_fn` callback
- removed `wic_send_pong*` interfaces
- changed URL schema to be an enum rather than string
- added mbed port work in progress
- fixed the echo example (was previously closing prematurely)

Author: cjhdev

.gitignore

@@ -4,3 +4,7 @@ mbed-os
 mbed-os.lib
 *.py
 *.pyc
+.gdbinit
+*.jlink
+*.py
+*.pyc

examples/autobahn/client.c

@@ -28,44 +28,29 @@
 #include <signal.h>
 #include <time.h>
 
+bool log_enabled = false;
+
 static void on_close(struct wic_inst *inst, uint16_t code, const char *reason, uint16_t size);
-static void on_text(struct wic_inst *inst, bool fin, const char *data, uint16_t size);
-static void on_binary(struct wic_inst *inst, bool fin, const void *data, uint16_t size);
-static void on_open(struct wic_inst *inst);
-static void do_write(struct wic_inst *inst, const void *data, size_t size);
-static uint32_t do_random(struct wic_inst *inst);
-static void on_text_case_count(struct wic_inst *inst, bool fin, const char *data, uint16_t size);
 
-static int n = 0;
+static void on_handshake_failure_handler(struct wic_inst *inst, enum wic_handshake_failure reason);
 
-static void do_client(int *s, struct wic_inst *inst, const struct wic_init_arg *arg)
-{
-    if(!wic_init(inst, arg)){
+static bool on_message(struct wic_inst *inst, enum wic_encoding encoding, bool fin, const char *data, uint16_t size);
+static bool on_message_case_count(struct wic_inst *inst, enum wic_encoding encoding, bool fin, const char *data, uint16_t size);
 
-        ERROR("could not init instance")
-        exit(EXIT_FAILURE);
-    }
+static void on_open(struct wic_inst *inst);
+static void on_send(struct wic_inst *inst, const void *data, size_t size, enum wic_buffer type);
+static uint32_t do_random(struct wic_inst *inst);
 
-    if(
-        transport_open_client(
-            wic_get_url_schema(inst),
-            wic_get_url_hostname(inst),
-            wic_get_url_port(inst),
-            s
-        )
-    ){
-        wic_start(inst);
+static void on_close_transport(struct wic_inst *inst);
+static void *on_buffer(struct wic_inst *inst, size_t min_size, enum wic_buffer type, size_t *max_size);
 
-        while(transport_recv(*s, inst));
+static void do_client(int *s, struct wic_inst *inst, const struct wic_init_arg *arg);
 
-        wic_close(inst);
-    }
-}
+static int n = 0;
 
 int main(int argc, char **argv)
 {
     static struct wic_inst inst;
-    static uint8_t tx_buffer[UINT16_MAX+100UL];
     static uint8_t rx_buffer[UINT16_MAX];
     static char url[1000U];
 
@@ -79,24 +64,24 @@ int main(int argc, char **argv)
 
     arg.rx = rx_buffer;
     arg.rx_max = sizeof(rx_buffer);
-    arg.tx = tx_buffer;
-    arg.tx_max = sizeof(tx_buffer);
     arg.on_open = on_open;    
     arg.on_close = on_close;
-    arg.write = do_write;
+    arg.on_send = on_send;
+    arg.on_buffer = on_buffer;
+    arg.on_close_transport = on_close_transport;
+    arg.on_handshake_failure = on_handshake_failure_handler;
     arg.rand = do_random;
     arg.app = &s;
     arg.role = WIC_ROLE_CLIENT;
     arg.url = url;
 
     arg.url = "ws://localhost:9001/getCaseCount?agent=wic";
-    arg.on_text = on_text_case_count;
+    arg.on_message = on_message_case_count;
 
     do_client(&s, &inst, &arg);
 
     arg.url = url;
-    arg.on_text = on_text;
-    arg.on_binary = on_binary;
+    arg.on_message = on_message;
 
     for(tc=1; tc <= n; tc++){
 
@@ -108,56 +93,102 @@ int main(int argc, char **argv)
     }
 
     arg.url = "ws://localhost:9001/updateReports?agent=wic";
-    arg.on_text = NULL;
-    arg.on_binary = NULL;
-
+    arg.on_message = NULL;
+    
     do_client(&s, &inst, &arg);
 
     LOG("exiting...")
 
     exit(EXIT_SUCCESS);
 }
 
+static void on_handshake_failure_handler(struct wic_inst *inst, enum wic_handshake_failure reason)
+{
+    LOG("websocket handshake failed for reason %d", reason);
+}
+
+static void do_client(int *s, struct wic_inst *inst, const struct wic_init_arg *arg)
+{
+    if(!wic_init(inst, arg)){
+
+        ERROR("could not init instance")
+        exit(EXIT_FAILURE);
+    }
+
+    if(
+        transport_open_client(
+            wic_get_url_schema(inst),
+            wic_get_url_hostname(inst),
+            wic_get_url_port(inst),
+            s
+        )
+    ){
+        if(wic_start(inst) == WIC_STATUS_SUCCESS){
+
+            while(transport_recv(*s, inst));
+        }
+        else{
+
+            transport_close(s);
+        }
+    }
+}
+
 static void on_close(struct wic_inst *inst, uint16_t code, const char *reason, uint16_t size)
 {
-    transport_close((int *)wic_get_app(inst));    
+    LOG("websocket closed for reason %u %.*s", code, size, reason);
 }
 
-static void on_text(struct wic_inst *inst, bool fin, const char *data, uint16_t size)
+static bool on_message(struct wic_inst *inst, enum wic_encoding encoding, bool fin, const char *data, uint16_t size)
 {
-    wic_send_text(inst, fin, data, size);
+    LOG("received %u bytes of %s %s", size, (encoding == WIC_ENCODING_UTF8) ? "text" : "binary", fin ? "(final)" : "");
+
+    wic_send(inst, encoding, fin, data, size);
+
+    return true;
 }
 
-static void on_text_case_count(struct wic_inst *inst, bool fin, const char *data, uint16_t size)
+static bool on_message_case_count(struct wic_inst *inst, enum wic_encoding encoding, bool fin, const char *data, uint16_t size)
 {
+    LOG("%.*s", size, data);
+
     if(size > 0){
 
         n = atoi(data);
     }
 
     wic_close(inst);
-}
 
-static void on_binary(struct wic_inst *inst, bool fin, const void *data, uint16_t size)
-{
-    wic_send_binary(inst, fin, data, size);
+    return true;
 }
 
 static void on_open(struct wic_inst *inst)
 {
+    LOG("websocket is open");
 }
 
-static void do_write(struct wic_inst *inst, const void *data, size_t size)
+static void on_send(struct wic_inst *inst, const void *data, size_t size, enum wic_buffer type)
 {
-    if(!transport_write(*(int *)wic_get_app(inst), data, size)){
+    LOG("sending buffer type %d", type);
 
-        ERROR("transport_write()")
+    transport_write(*(int *)wic_get_app(inst), data, size);
+}
 
-        wic_close(inst);
-    }
+static void on_close_transport(struct wic_inst *inst)
+{
+    transport_close((int *)wic_get_app(inst));
 }
 
 static uint32_t do_random(struct wic_inst *inst)
 {
     return rand();
 }
+
+static void *on_buffer(struct wic_inst *inst, size_t min_size, enum wic_buffer type, size_t *max_size)
+{
+    static uint8_t tx[UINT16_MAX+100UL];
+    
+    *max_size = sizeof(tx);
+
+    return (min_size <= sizeof(tx)) ? tx : NULL;
+}

examples/autobahn/config/fuzzingserver.json

@@ -4,12 +4,6 @@
     "outdir": "./reports/clients",
     "cases": ["*"],
     "exclude-cases": [
-        "9.3.*",
-        "9.4.*",
-        "9.5.*",
-        "9.6.*",
-        "9.7.*",
-        "9.8.*"
-        ],
+    ],
     "exclude-agent-cases": {}
 }

examples/autobahn/log.h

@@ -24,7 +24,9 @@
 
 #include <stdio.h>
 
-#define LOG(...) do{printf("%s: ", __FILE__);printf(__VA_ARGS__);printf("\n");fflush(stdout);}while(0);
-#define ERROR(...) do{fprintf(stderr, "error: ");fprintf(stderr, __VA_ARGS__);fprintf(stderr, "\n");fflush(stderr);}while(0);
+extern bool log_enabled;
+
+#define LOG(...) do{if(log_enabled){printf(__VA_ARGS__);printf("\n");fflush(stdout);}}while(0);
+#define ERROR(...) do{fprintf(stderr, "%s: ", __FILE__);fprintf(stderr, "error: ");fprintf(stderr, __VA_ARGS__);fprintf(stderr, "\n");fflush(stderr);}while(0);
 
 #endif

examples/autobahn/makefile

@@ -18,7 +18,7 @@ CFLAGS += -D'WIC_PORT_INCLUDE="port.h"'
 SRC := $(notdir $(wildcard $(DIR_ROOT)/src/*.c)) transport.c
 OBJ := $(SRC:.c=.o)
 
-all: $(addprefix bin/, client server)
+all: $(addprefix bin/, client)
 
 bin/client: $(addprefix build/,$(OBJ) client.o)
 	$(CC) $(LDFLAGS) $^ -o $@