mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-06 13:37:34 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

websocket code fix, https://github.com/valenok/mongoose/pull/146

Browse Source
This commit is contained in:
Sergey Lyubka 2013-05-10 13:41:48 +01:00
parent 39cd5b8323
commit 6f946f5eea
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mongoose.c
View File

@ -1509,6 +1509,26 @@ static int pull(FILE *fp, struct mg_connection *conn, char *buf, int len) {
return conn->ctx->stop_flag ? -1 : nread; return conn->ctx->stop_flag ? -1 : nread;
} }
static int pull_all(FILE *fp, struct mg_connection *conn, char *buf, int len) {
int n, nread = 0;
while (len > 0) {
n = pull(fp, conn, buf + nread, len);
if (n < 0) {
nread = n; // Propagate the error
break;
} else if (n == 0) {
break; // No more data to read
} else {
conn->consumed_content += n;
nread += n;
len -= n;
}
}
return nread;
}
int mg_read(struct mg_connection *conn, void *buf, size_t len) { int mg_read(struct mg_connection *conn, void *buf, size_t len) {
int n, buffered_len, nread; int n, buffered_len, nread;
const char *body; const char *body;
@ -1536,20 +1556,8 @@ int mg_read(struct mg_connection *conn, void *buf, size_t len) {
} }
// We have returned all buffered data. Read new data from the remote socket. // We have returned all buffered data. Read new data from the remote socket.
while (len > 0) { n = pull_all(NULL, conn, (char *) buf, (int) len);
n = pull(NULL, conn, (char *) buf, (int) len); nread = n >= 0 ? nread + n : n;
if (n < 0) {
nread = n; // Propagate the error
break;
} else if (n == 0) {
break; // No more data to read
} else {
buf = (char *) buf + n;
conn->consumed_content += n;
nread += n;
len -= n;
}
}
} }
return nread; return nread;
} }
@ -3841,8 +3849,8 @@ static void read_websocket(struct mg_connection *conn) {
len = body_len - header_len; len = body_len - header_len;
memcpy(data, buf + header_len, len); memcpy(data, buf + header_len, len);
// TODO: handle pull error // TODO: handle pull error
pull(NULL, conn, data + len, data_len - len); pull_all(NULL, conn, data + len, data_len - len);
conn->data_len = 0; conn->data_len = conn->request_len;
} else { } else {
len = data_len + header_len; len = data_len + header_len;
memcpy(data, buf + header_len, data_len); memcpy(data, buf + header_len, data_len);