a1batross
/
kore
forked from mirrors/kore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more websocket improvements. 

- send a CLOSE opcode if we haven't yet when removing a ws client.
- ignore unsolicited PONG.
This commit is contained in:
Joris Vink 2017-01-30 22:21:57 +01:00
parent d5a32c2dab
commit 8b26ecdf14
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/kore.h
View File

@ -143,6 +143,7 @@ TAILQ_HEAD(netbuf_head, netbuf);
#define CONN_IDLE_TIMER_ACT 0x10 #define CONN_IDLE_TIMER_ACT 0x10
#define CONN_READ_BLOCK 0x20 #define CONN_READ_BLOCK 0x20
#define CONN_CLOSE_EMPTY 0x40 #define CONN_CLOSE_EMPTY 0x40
#define CONN_WS_CLOSE_SENT 0x80
#define KORE_IDLE_TIMER_MAX 20000 #define KORE_IDLE_TIMER_MAX 20000

15
src/websocket.c
View File

@ -144,6 +144,8 @@ kore_websocket_send(struct connection *c, u_int8_t op, const void *data,
websocket_frame_build(frame, op, data, len); websocket_frame_build(frame, op, data, len);
net_send_queue(c, frame->data, frame->offset); net_send_queue(c, frame->data, frame->offset);
kore_buf_free(frame); kore_buf_free(frame);
net_send_flush(c);
} }
void void
@ -315,8 +317,9 @@ websocket_recv_frame(struct netbuf *nb)
ret = KORE_RESULT_OK; ret = KORE_RESULT_OK;
switch (op) { switch (op) {
case WEBSOCKET_OP_CONT:
case WEBSOCKET_OP_PONG: case WEBSOCKET_OP_PONG:
break;
case WEBSOCKET_OP_CONT:
ret = KORE_RESULT_ERROR; ret = KORE_RESULT_ERROR;
kore_log(LOG_ERR, "%p: we do not support op 0x%02x yet", c, op); kore_log(LOG_ERR, "%p: we do not support op 0x%02x yet", c, op);
break; break;
@ -328,7 +331,10 @@ websocket_recv_frame(struct netbuf *nb)
} }
break; break;
case WEBSOCKET_OP_CLOSE: case WEBSOCKET_OP_CLOSE:
kore_websocket_send(c, WEBSOCKET_OP_CLOSE, NULL, 0); if (!(c->flags & CONN_WS_CLOSE_SENT)) {
c->flags |= CONN_WS_CLOSE_SENT;
kore_websocket_send(c, WEBSOCKET_OP_CLOSE, NULL, 0);
}
kore_connection_disconnect(c); kore_connection_disconnect(c);
break; break;
case WEBSOCKET_OP_PING: case WEBSOCKET_OP_PING:
@ -347,6 +353,11 @@ websocket_recv_frame(struct netbuf *nb)
static void static void
websocket_disconnect(struct connection *c) websocket_disconnect(struct connection *c)
{ {
if (!(c->flags & CONN_WS_CLOSE_SENT)) {
c->flags |= CONN_WS_CLOSE_SENT;
kore_websocket_send(c, WEBSOCKET_OP_CLOSE, NULL, 0);
}
if (c->ws_disconnect != NULL) if (c->ws_disconnect != NULL)
kore_runtime_wsdisconnect(c->ws_disconnect, c); kore_runtime_wsdisconnect(c->ws_disconnect, c);
} }