/*
- * Copyright 2016 iot.bzh
+ * Copyright (C) 2016 "IoT.bzh"
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#define FRAME_GET_PAYLOAD_LEN(BYTE) ( (BYTE) & 0x7F)
#define FRAME_SET_FIN(BYTE) (((BYTE) & 0x01) << 7)
-#define FRAME_SET_OPCODE(BYTE) ((BYTE) & 0x0F)
+#define FRAME_SET_RSV1(BYTE) (((BYTE) & 0x01) << 6)
+#define FRAME_SET_RSV2(BYTE) (((BYTE) & 0x01) << 5)
+#define FRAME_SET_RSV3(BYTE) (((BYTE) & 0x01) << 4)
+#define FRAME_SET_OPCODE(BYTE) ((BYTE) & 0x0F)
#define FRAME_SET_MASK(BYTE) (((BYTE) & 0x01) << 7)
#define FRAME_SET_LENGTH(X64, IDX) (unsigned char)(((X64) >> ((IDX)*8)) & 0xFF)
#define STATE_START 1
#define STATE_LENGTH 2
#define STATE_DATA 3
-#define STATE_CLOSED 4
struct websock {
int state;
return ws_readv(ws, &iov, 1);
}
-static ssize_t websock_send(struct websock *ws, unsigned char opcode,
- const void *buffer, size_t buffer_size)
+static int websock_send_internal_v(struct websock *ws, unsigned char first, const struct iovec *iovec, int count)
{
- struct iovec iov[2];
- size_t pos;
+ struct iovec iov[32];
+ int i, j;
+ size_t pos, size, len;
ssize_t rc;
unsigned char header[32];
- if (ws->state == STATE_CLOSED)
- return 0;
+ /* checks count */
+ if (count < 0 || (count + 1) > (int)(sizeof iov / sizeof * iov)) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ /* computes the size */
+ size = 0;
+ i = 1;
+ for (j = 0 ; j < count ; j++) {
+ iov[i].iov_base = iovec[j].iov_base;
+ len = iovec[j].iov_len;
+ if (len != 0) {
+ iov[i].iov_len = len;
+ size += len;
+ i++;
+ }
+ }
+ /* makes the header */
pos = 0;
- header[pos++] = (unsigned char)(FRAME_SET_FIN(1) | FRAME_SET_OPCODE(opcode));
- buffer_size = (uint64_t) buffer_size;
- if (buffer_size < 126) {
- header[pos++] =
- FRAME_SET_MASK(0) | FRAME_SET_LENGTH(buffer_size, 0);
+ header[pos++] = first;
+ size = (uint64_t) size;
+ if (size < 126) {
+ header[pos++] = FRAME_SET_MASK(0) | FRAME_SET_LENGTH(size, 0);
} else {
- if (buffer_size < 65536) {
+ if (size < 65536) {
header[pos++] = FRAME_SET_MASK(0) | 126;
} else {
header[pos++] = FRAME_SET_MASK(0) | 127;
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 7);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 6);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 5);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 4);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 3);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 2);
+ header[pos++] = FRAME_SET_LENGTH(size, 7);
+ header[pos++] = FRAME_SET_LENGTH(size, 6);
+ header[pos++] = FRAME_SET_LENGTH(size, 5);
+ header[pos++] = FRAME_SET_LENGTH(size, 4);
+ header[pos++] = FRAME_SET_LENGTH(size, 3);
+ header[pos++] = FRAME_SET_LENGTH(size, 2);
}
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 1);
- header[pos++] = FRAME_SET_LENGTH(buffer_size, 0);
+ header[pos++] = FRAME_SET_LENGTH(size, 1);
+ header[pos++] = FRAME_SET_LENGTH(size, 0);
}
+ /* allocates the vec */
iov[0].iov_base = header;
iov[0].iov_len = pos;
- iov[1].iov_base = (void *)buffer; /* const cast */
- iov[1].iov_len = buffer_size;
+ rc = ws_writev(ws, iov, i);
- rc = ws_writev(ws, iov, 1 + !!buffer_size);
+ return rc < 0 ? -1 : 0;
+}
- if (opcode == OPCODE_CLOSE) {
- ws->length = 0;
- ws->state = STATE_CLOSED;
- ws->itf->disconnect(ws->closure);
- }
- return rc;
+static int websock_send_internal(struct websock *ws, unsigned char first, const void *buffer, size_t size)
+{
+ struct iovec iov;
+
+ iov.iov_base = (void *)buffer;
+ iov.iov_len = size;
+ return websock_send_internal_v(ws, first, &iov, 1);
+}
+
+static inline int websock_send_v(struct websock *ws, int last, int rsv1, int rsv2, int rsv3, int opcode, const struct iovec *iovec, int count)
+{
+ unsigned char first = (unsigned char)(FRAME_SET_FIN(last)
+ | FRAME_SET_RSV1(rsv1)
+ | FRAME_SET_RSV1(rsv2)
+ | FRAME_SET_RSV1(rsv3)
+ | FRAME_SET_OPCODE(opcode));
+ return websock_send_internal_v(ws, first, iovec, count);
}
-void websock_close(struct websock *ws)
+static inline int websock_send(struct websock *ws, int last, int rsv1, int rsv2, int rsv3, int opcode, const void *buffer, size_t size)
{
- websock_send(ws, OPCODE_CLOSE, NULL, 0);
+ unsigned char first = (unsigned char)(FRAME_SET_FIN(last)
+ | FRAME_SET_RSV1(rsv1)
+ | FRAME_SET_RSV1(rsv2)
+ | FRAME_SET_RSV1(rsv3)
+ | FRAME_SET_OPCODE(opcode));
+ return websock_send_internal(ws, first, buffer, size);
}
-void websock_close_code(struct websock *ws, uint16_t code)
+int websock_close_empty(struct websock *ws)
+{
+ return websock_close(ws, WEBSOCKET_CODE_NOT_SET, NULL, 0);
+}
+
+int websock_close(struct websock *ws, uint16_t code, const void *data, size_t length)
{
unsigned char buffer[2];
- /* Send server-side closing handshake */
+ struct iovec iov[2];
+
+ if (code == WEBSOCKET_CODE_NOT_SET && length == 0)
+ return websock_send(ws, 1, 0, 0, 0, OPCODE_CLOSE, NULL, 0);
+
+ /* checks the length */
+ if (length > 123) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ /* prepare the buffer */
buffer[0] = (unsigned char)((code >> 8) & 0xFF);
buffer[1] = (unsigned char)(code & 0xFF);
- websock_send(ws, OPCODE_CLOSE, buffer, 2);
+
+ /* Send server-side closing handshake */
+ iov[0].iov_base = (void *)buffer;
+ iov[0].iov_len = 2;
+ iov[1].iov_base = (void *)data;
+ iov[1].iov_len = length;
+ return websock_send_v(ws, 1, 0, 0, 0, OPCODE_CLOSE, iov, 2);
}
-void websock_ping(struct websock *ws)
+int websock_ping(struct websock *ws, const void *data, size_t length)
{
- websock_send(ws, OPCODE_PING, NULL, 0);
+ /* checks the length */
+ if (length > 125) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ return websock_send(ws, 1, 0, 0, 0, OPCODE_PING, data, length);
}
-void websock_pong(struct websock *ws)
+int websock_pong(struct websock *ws, const void *data, size_t length)
{
- websock_send(ws, OPCODE_PONG, NULL, 0);
+ /* checks the length */
+ if (length > 125) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ return websock_send(ws, 1, 0, 0, 0, OPCODE_PONG, data, length);
+}
+
+int websock_text(struct websock *ws, int last, const void *text, size_t length)
+{
+ return websock_send(ws, last, 0, 0, 0, OPCODE_TEXT, text, length);
+}
+
+int websock_text_v(struct websock *ws, int last, const struct iovec *iovec, int count)
+{
+ return websock_send_v(ws, last, 0, 0, 0, OPCODE_TEXT, iovec, count);
+}
+
+int websock_binary(struct websock *ws, int last, const void *data, size_t length)
+{
+ return websock_send(ws, last, 0, 0, 0, OPCODE_BINARY, data, length);
+}
+
+int websock_binary_v(struct websock *ws, int last, const struct iovec *iovec, int count)
+{
+ return websock_send_v(ws, last, 0, 0, 0, OPCODE_BINARY, iovec, count);
+}
+
+int websock_continue(struct websock *ws, int last, const void *data, size_t length)
+{
+ return websock_send(ws, last, 0, 0, 0, OPCODE_CONTINUATION, data, length);
}
-void websock_text(struct websock *ws, const char *text, size_t length)
+int websock_continue_v(struct websock *ws, int last, const struct iovec *iovec, int count)
{
- websock_send(ws, OPCODE_TEXT, text, length);
+ return websock_send_v(ws, last, 0, 0, 0, OPCODE_CONTINUATION, iovec, count);
}
-void websock_binary(struct websock *ws, const void *data, size_t length)
+int websock_error(struct websock *ws, uint16_t code, const void *data, size_t size)
{
- websock_send(ws, OPCODE_BINARY, data, length);
+ int rc = websock_close(ws, code, data, size);
+ if (ws->itf->on_error != NULL)
+ ws->itf->on_error(ws->closure, code, data, size);
+ return rc;
}
static int read_header(struct websock *ws)
return 0;
}
+static int check_control_header(struct websock *ws)
+{
+ /* sanity checks */
+ if (FRAME_GET_RSV1(ws->header[0]) != 0)
+ return 0;
+ if (FRAME_GET_RSV2(ws->header[0]) != 0)
+ return 0;
+ if (FRAME_GET_RSV3(ws->header[0]) != 0)
+ return 0;
+ if (FRAME_GET_PAYLOAD_LEN(ws->header[1]) > 125)
+ return 0;
+ if (FRAME_GET_OPCODE(ws->header[0]) == OPCODE_CLOSE)
+ return FRAME_GET_PAYLOAD_LEN(ws->header[1]) != 1;
+ return 1;
+}
+
int websock_dispatch(struct websock *ws)
{
+ uint16_t code;
loop:
switch (ws->state) {
case STATE_INIT:
return -1;
else if (ws->lenhead < ws->szhead)
return 0;
- /* sanity checks */
- if (FRAME_GET_RSV1(ws->header[0]) != 0)
- goto protocol_error;
- if (FRAME_GET_RSV2(ws->header[0]) != 0)
- goto protocol_error;
- if (FRAME_GET_RSV3(ws->header[0]) != 0)
- goto protocol_error;
/* fast track */
switch (FRAME_GET_OPCODE(ws->header[0])) {
case OPCODE_CONTINUATION:
case OPCODE_BINARY:
break;
case OPCODE_CLOSE:
- if (FRAME_GET_MASK(ws->header[1]))
- goto protocol_error;
- if (FRAME_GET_PAYLOAD_LEN(ws->header[1]) == 1)
+ if (!check_control_header(ws))
goto protocol_error;
if (FRAME_GET_PAYLOAD_LEN(ws->header[1]))
ws->szhead += 2;
break;
case OPCODE_PING:
- if (FRAME_GET_MASK(ws->header[1]))
- goto protocol_error;
- if (FRAME_GET_PAYLOAD_LEN(ws->header[1]) != 0)
- goto protocol_error;
- if (ws->itf->on_ping)
- ws->itf->on_ping(ws->closure);
- else
- websock_pong(ws);
- ws->state = STATE_INIT;
- goto loop;
case OPCODE_PONG:
- if (FRAME_GET_MASK(ws->header[1]))
+ if (!check_control_header(ws))
goto protocol_error;
- if (FRAME_GET_PAYLOAD_LEN(ws->header[1]) != 0)
- goto protocol_error;
- if (ws->itf->on_pong)
- ws->itf->on_pong(ws->closure);
- ws->state = STATE_INIT;
- goto loop;
default:
- goto protocol_error;
+ break;
}
/* update heading size */
switch (FRAME_GET_PAYLOAD_LEN(ws->header[1])) {
return -1;
else if (ws->lenhead < ws->szhead)
return 0;
- /* compute header values */
+
+ /* compute length */
switch (FRAME_GET_PAYLOAD_LEN(ws->header[1])) {
case 127:
ws->length = (((uint64_t) ws->header[2]) << 56)
ws->length = FRAME_GET_PAYLOAD_LEN(ws->header[1]);
break;
}
+ if (FRAME_GET_OPCODE(ws->header[0]) == OPCODE_CLOSE && ws->length != 0)
+ ws->length -= 2;
if (ws->length > ws->maxlength)
goto too_long_error;
+
+ /* compute mask */
if (FRAME_GET_MASK(ws->header[1])) {
((unsigned char *)&ws->mask)[0] = ws->header[ws->szhead - 4];
((unsigned char *)&ws->mask)[1] = ws->header[ws->szhead - 3];
((unsigned char *)&ws->mask)[3] = ws->header[ws->szhead - 1];
} else
ws->mask = 0;
+
+ /* all heading fields are known, process */
ws->state = STATE_DATA;
+ if (ws->itf->on_extension != NULL) {
+ if (ws->itf->on_extension(ws->closure,
+ FRAME_GET_FIN(ws->header[0]),
+ FRAME_GET_RSV1(ws->header[0]),
+ FRAME_GET_RSV2(ws->header[0]),
+ FRAME_GET_RSV3(ws->header[0]),
+ FRAME_GET_OPCODE(ws->header[0]),
+ (size_t) ws->length)) {
+ return 0;
+ }
+ }
+
+ /* not an extension case */
+ if (FRAME_GET_RSV1(ws->header[0]) != 0)
+ goto protocol_error;
+ if (FRAME_GET_RSV2(ws->header[0]) != 0)
+ goto protocol_error;
+ if (FRAME_GET_RSV3(ws->header[0]) != 0)
+ goto protocol_error;
+
+ /* handle */
switch (FRAME_GET_OPCODE(ws->header[0])) {
case OPCODE_CONTINUATION:
ws->itf->on_continue(ws->closure,
(size_t) ws->length);
break;
case OPCODE_CLOSE:
- ws->state = STATE_CLOSED;
- if (ws->length)
- ws->itf->on_close(ws->closure,
- (uint16_t)((((uint16_t) ws-> header[2]) << 8) | ((uint16_t) ws->header[3])),
- (size_t) ws->length);
- else
- ws->itf->on_close(ws->closure,
- STATUS_CODE_UNSET, 0);
- ws->itf->disconnect(ws->closure);
+ if (ws->length == 0)
+ code = WEBSOCKET_CODE_NOT_SET;
+ else {
+ code = (uint16_t)(ws->header[ws->szhead - 2] & 0xff);
+ code = (uint16_t)(code << 8);
+ code = (uint16_t)(code | (uint16_t)(ws->header[ws->szhead - 1] & 0xff));
+ }
+ ws->itf->on_close(ws->closure, code, (size_t) ws->length);
return 0;
+ case OPCODE_PING:
+ if (ws->itf->on_ping)
+ ws->itf->on_ping(ws->closure, ws->length);
+ else {
+ websock_drop(ws);
+ websock_pong(ws, NULL, 0);
+ }
+ ws->state = STATE_INIT;
+ break;
+ case OPCODE_PONG:
+ if (ws->itf->on_pong)
+ ws->itf->on_pong(ws->closure, ws->length);
+ else
+ websock_drop(ws);
+ ws->state = STATE_INIT;
+ break;
+ default:
+ goto protocol_error;
}
break;
return 0;
ws->state = STATE_INIT;
break;
-
- case STATE_CLOSED:
- return 0;
}
goto loop;
too_long_error:
- websock_close_code(ws, STATUS_CODE_MESSAGE_TOO_LARGE);
+ websock_error(ws, WEBSOCKET_CODE_MESSAGE_TOO_LARGE, NULL, 0);
return 0;
protocol_error:
- websock_close_code(ws, STATUS_CODE_PROTOCOL_ERROR);
+ websock_error(ws, WEBSOCKET_CODE_PROTOCOL_ERROR, NULL, 0);
return 0;
}
-ssize_t websock_read(struct websock * ws, void *buffer, size_t size)
+static void unmask(struct websock * ws, void *buffer, size_t size)
{
uint32_t mask, *b32;
uint8_t m, *b8;
+
+ mask = ws->mask;
+ b8 = buffer;
+ while (size && ((sizeof(uint32_t) - 1) & (uintptr_t) b8)) {
+ m = ((uint8_t *) & mask)[0];
+ ((uint8_t *) & mask)[0] = ((uint8_t *) & mask)[1];
+ ((uint8_t *) & mask)[1] = ((uint8_t *) & mask)[2];
+ ((uint8_t *) & mask)[2] = ((uint8_t *) & mask)[3];
+ ((uint8_t *) & mask)[3] = m;
+ *b8++ ^= m;
+ size--;
+ }
+ b32 = (uint32_t *) b8;
+ while (size >= sizeof(uint32_t)) {
+ *b32++ ^= mask;
+ size -= sizeof(uint32_t);
+ }
+ b8 = (uint8_t *) b32;
+ while (size) {
+ m = ((uint8_t *) & mask)[0];
+ ((uint8_t *) & mask)[0] = ((uint8_t *) & mask)[1];
+ ((uint8_t *) & mask)[1] = ((uint8_t *) & mask)[2];
+ ((uint8_t *) & mask)[2] = ((uint8_t *) & mask)[3];
+ ((uint8_t *) & mask)[3] = m;
+ *b8++ ^= m;
+ size--;
+ }
+ ws->mask = mask;
+}
+
+ssize_t websock_read(struct websock * ws, void *buffer, size_t size)
+{
ssize_t rc;
- if (ws->state != STATE_DATA && ws->state != STATE_CLOSED)
+ if (ws->state != STATE_DATA)
return 0;
if (size > ws->length)
size = (size_t) rc;
ws->length -= size;
- if (ws->mask) {
- mask = ws->mask;
- b8 = buffer;
- while (size && ((sizeof(uint32_t) - 1) & (uintptr_t) b8)) {
- m = ((uint8_t *) & mask)[0];
- ((uint8_t *) & mask)[0] = ((uint8_t *) & mask)[1];
- ((uint8_t *) & mask)[1] = ((uint8_t *) & mask)[2];
- ((uint8_t *) & mask)[2] = ((uint8_t *) & mask)[3];
- ((uint8_t *) & mask)[3] = m;
- *b8++ ^= m;
- size--;
- }
- b32 = (uint32_t *) b8;
- while (size >= sizeof(uint32_t)) {
- *b32++ ^= mask;
- size -= sizeof(uint32_t);
- }
- b8 = (uint8_t *) b32;
- while (size) {
- m = ((uint8_t *) & mask)[0];
- ((uint8_t *) & mask)[0] = ((uint8_t *) & mask)[1];
- ((uint8_t *) & mask)[1] = ((uint8_t *) & mask)[2];
- ((uint8_t *) & mask)[2] = ((uint8_t *) & mask)[3];
- ((uint8_t *) & mask)[3] = m;
- *b8++ ^= m;
- size--;
- }
- ws->mask = mask;
- }
+ if (ws->mask != 0)
+ unmask(ws, buffer, size);
}
return rc;
}
-void websock_drop(struct websock *ws)
+int websock_drop(struct websock *ws)
{
- char buffer[4096];
+ char buffer[8000];
- while (ws->length && ws_read(ws, buffer, sizeof buffer) >= 0) ;
+ while (ws->length)
+ if (websock_read(ws, buffer, sizeof buffer) < 0)
+ return -1;
+ return 0;
}
-struct websock *websock_create(const struct websock_itf *itf, void *closure)
+struct websock *websock_create_v13(const struct websock_itf *itf, void *closure)
{
struct websock *result = calloc(1, sizeof *result);
if (result) {