mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-07-31 18:06:14 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #562 from cesanta/sdp

Browse Source 
Swallow responses to internal pings
This commit is contained in:
Marko Mikulicic 2015-08-12 19:45:04 +02:00
commit a73fce945c
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/server_data_push/server_data_push.c
View File

@ -62,13 +62,6 @@ static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
case MG_POLL: case MG_POLL:
maybe_send_data(conn); maybe_send_data(conn);
return MG_FALSE; /* Keep the connection open. */ return MG_FALSE; /* Keep the connection open. */
case MG_REQUEST:
/* FIXME: This is a bug in Mongoose - ping requests are generated internally
* but responses fall through to the user who may not expect them. */
if (conn->is_websocket && (conn->wsbits & 0xf) == WEBSOCKET_OPCODE_PONG) {
return MG_TRUE;
}
return MG_FALSE;
case MG_CLOSE: case MG_CLOSE:
fprintf(stderr, "%s:%u went away\n", conn->remote_ip, conn->remote_port); fprintf(stderr, "%s:%u went away\n", conn->remote_ip, conn->remote_port);
free(conn->connection_param); free(conn->connection_param);

24
mongoose.c
View File

@ -3047,6 +3047,9 @@ static void send_websocket_handshake(struct mg_connection *conn,
mg_write(conn, buf, strlen(buf)); mg_write(conn, buf, strlen(buf));
} }
#define MG_S_WEBSOCKET_PING_DATA_LEN 16
static const char s_websocket_ping_data[] = "4d6f6e676f6f7365"; /* Mongoose */
static size_t deliver_websocket_frame(struct connection *conn) { static size_t deliver_websocket_frame(struct connection *conn) {
// Having buf unsigned char * is important, as it is used below in arithmetic // Having buf unsigned char * is important, as it is used below in arithmetic
unsigned char *buf = (unsigned char *) conn->ns_conn->recv_iobuf.buf; unsigned char *buf = (unsigned char *) conn->ns_conn->recv_iobuf.buf;
@ -3073,6 +3076,7 @@ static size_t deliver_websocket_frame(struct connection *conn) {
buffered = frame_len > 0 && frame_len <= buf_len; buffered = frame_len > 0 && frame_len <= buf_len;
if (buffered) { if (buffered) {
int opcode = buf[0] & 0x0f;
conn->mg_conn.content_len = data_len; conn->mg_conn.content_len = data_len;
conn->mg_conn.content = (char *) buf + header_len; conn->mg_conn.content = (char *) buf + header_len;
conn->mg_conn.wsbits = buf[0]; conn->mg_conn.wsbits = buf[0];
@ -3084,11 +3088,19 @@ static size_t deliver_websocket_frame(struct connection *conn) {
} }
} }
// Call the handler and remove frame from the iobuf if (opcode == WEBSOCKET_OPCODE_PONG &&
if (call_user(conn, MG_REQUEST) == MG_FALSE || data_len == MG_S_WEBSOCKET_PING_DATA_LEN &&
(buf[0] & 0x0f) == WEBSOCKET_OPCODE_CONNECTION_CLOSE) { memcmp(buf + header_len, s_websocket_ping_data,
conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA; MG_S_WEBSOCKET_PING_DATA_LEN) == 0) {
DBG(("ws pong"));
/* This is a response to our ping, swallow it. */
} else {
if (call_user(conn, MG_REQUEST) == MG_FALSE ||
opcode == WEBSOCKET_OPCODE_CONNECTION_CLOSE) {
conn->ns_conn->flags |= NSF_FINISHED_SENDING_DATA;
}
} }
iobuf_remove(&conn->ns_conn->recv_iobuf, frame_len); iobuf_remove(&conn->ns_conn->recv_iobuf, frame_len);
} }
@ -3184,7 +3196,9 @@ static void send_websocket_handshake_if_requested(struct mg_connection *conn) {
static void ping_idle_websocket_connection(struct connection *conn, time_t t) { static void ping_idle_websocket_connection(struct connection *conn, time_t t) {
if (t - conn->ns_conn->last_io_time > MONGOOSE_USE_WEBSOCKET_PING_INTERVAL) { if (t - conn->ns_conn->last_io_time > MONGOOSE_USE_WEBSOCKET_PING_INTERVAL) {
mg_websocket_write(&conn->mg_conn, WEBSOCKET_OPCODE_PING, "", 0); DBG(("ws ping"));
mg_websocket_write(&conn->mg_conn, WEBSOCKET_OPCODE_PING,
s_websocket_ping_data, MG_S_WEBSOCKET_PING_DATA_LEN);
} }
} }
#else #else