mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-20 19:41:58 +00:00
Use MG_EV_WS_CTL for WS control messages
This commit is contained in:
1 parent
e0a1feafe0
commit
3895678bee
7 files changed
+32
-30
No files matched your search
+14
-14
@@ -568,7 +568,7 @@ int mg_http_parse(const char *s, size_t len, struct mg_http_message *hm) {
|
|||||||
mg_http_parse_headers(s, end, hm->headers,
|
mg_http_parse_headers(s, end, hm->headers,
|
||||||
sizeof(hm->headers) / sizeof(hm->headers[0]));
|
sizeof(hm->headers) / sizeof(hm->headers[0]));
|
||||||
if ((cl = mg_http_get_header(hm, "Content-Length")) != NULL) {
|
if ((cl = mg_http_get_header(hm, "Content-Length")) != NULL) {
|
||||||
hm->body.len = (size_t) mg_to64(cl->ptr);
|
hm->body.len = (size_t) mg_to64(*cl);
|
||||||
hm->message.len = req_len + hm->body.len;
|
hm->message.len = req_len + hm->body.len;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3751,14 +3751,15 @@ int mg_asprintf(char **buf, size_t size, const char *fmt, ...) {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t mg_to64(const char *s) {
|
int64_t mg_to64(struct mg_str str) {
|
||||||
int64_t result = 0, neg = 1;
|
int64_t result = 0, neg = 1;
|
||||||
while (*s && isspace((unsigned char) *s)) s++;
|
size_t i = 0;
|
||||||
if (*s == '-') neg = -1, s++;
|
while (i < str.len && (str.ptr[i] == ' ' || str.ptr[i] == '\t')) i++;
|
||||||
while (isdigit((unsigned char) *s)) {
|
if (i < str.len && str.ptr[i] == '-') neg = -1, i++;
|
||||||
|
while (i < str.len && str.ptr[i] >= '0' && str.ptr[i] <= '9') {
|
||||||
result *= 10;
|
result *= 10;
|
||||||
result += (*s - '0');
|
result += (str.ptr[i] - '0');
|
||||||
s++;
|
i++;
|
||||||
}
|
}
|
||||||
return result * neg;
|
return result * neg;
|
||||||
}
|
}
|
||||||
@@ -3947,24 +3948,23 @@ static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
|
|||||||
|
|
||||||
while (ws_process(c->recv.buf, c->recv.len, &msg) > 0) {
|
while (ws_process(c->recv.buf, c->recv.len, &msg) > 0) {
|
||||||
char *s = (char *) c->recv.buf + msg.header_len;
|
char *s = (char *) c->recv.buf + msg.header_len;
|
||||||
|
struct mg_ws_message m = {{s, msg.data_len}, msg.flags};
|
||||||
switch (msg.flags & WEBSOCKET_FLAGS_MASK_OP) {
|
switch (msg.flags & WEBSOCKET_FLAGS_MASK_OP) {
|
||||||
case WEBSOCKET_OP_PING:
|
case WEBSOCKET_OP_PING:
|
||||||
LOG(LL_DEBUG, ("%s", "WS PONG"));
|
LOG(LL_DEBUG, ("%s", "WS PONG"));
|
||||||
mg_ws_send(c, s, msg.data_len, WEBSOCKET_OP_PONG);
|
mg_ws_send(c, s, msg.data_len, WEBSOCKET_OP_PONG);
|
||||||
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
break;
|
break;
|
||||||
case WEBSOCKET_OP_PONG:
|
case WEBSOCKET_OP_PONG:
|
||||||
// Ignore
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
break;
|
break;
|
||||||
case WEBSOCKET_OP_CLOSE: {
|
case WEBSOCKET_OP_CLOSE:
|
||||||
struct mg_ws_message evd = {{s, msg.data_len}, msg.flags};
|
|
||||||
LOG(LL_ERROR, ("%lu Got WS CLOSE", c->id));
|
LOG(LL_ERROR, ("%lu Got WS CLOSE", c->id));
|
||||||
mg_call(c, MG_EV_WS_MSG, &evd);
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
c->is_closing = 1;
|
c->is_closing = 1;
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
default: {
|
default: {
|
||||||
struct mg_ws_message evd = {{s, msg.data_len}, msg.flags};
|
mg_call(c, MG_EV_WS_MSG, &m);
|
||||||
mg_call(c, MG_EV_WS_MSG, &evd);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -428,7 +428,7 @@ void mg_unhex(const char *buf, int len, unsigned char *to);
|
|||||||
unsigned long mg_unhexn(const char *s, int len);
|
unsigned long mg_unhexn(const char *s, int len);
|
||||||
int mg_asprintf(char **buf, size_t size, const char *fmt, ...);
|
int mg_asprintf(char **buf, size_t size, const char *fmt, ...);
|
||||||
int mg_vasprintf(char **buf, size_t size, const char *fmt, va_list ap);
|
int mg_vasprintf(char **buf, size_t size, const char *fmt, va_list ap);
|
||||||
int64_t mg_to64(const char *s);
|
int64_t mg_to64(struct mg_str str);
|
||||||
double mg_time(void);
|
double mg_time(void);
|
||||||
unsigned long mg_millis(void);
|
unsigned long mg_millis(void);
|
||||||
void mg_usleep(unsigned long usecs);
|
void mg_usleep(unsigned long usecs);
|
||||||
@@ -570,6 +570,7 @@ enum {
|
|||||||
MG_EV_HTTP_MSG, // HTTP request/response struct mg_http_message *
|
MG_EV_HTTP_MSG, // HTTP request/response struct mg_http_message *
|
||||||
MG_EV_WS_OPEN, // Websocket handshake done NULL
|
MG_EV_WS_OPEN, // Websocket handshake done NULL
|
||||||
MG_EV_WS_MSG, // Websocket message received struct mg_ws_message *
|
MG_EV_WS_MSG, // Websocket message received struct mg_ws_message *
|
||||||
|
MG_EV_WS_CTL, // Websocket control message struct mg_ws_message *
|
||||||
MG_EV_MQTT_CMD, // MQTT low-level command struct mg_mqtt_message *
|
MG_EV_MQTT_CMD, // MQTT low-level command struct mg_mqtt_message *
|
||||||
MG_EV_MQTT_MSG, // MQTT PUBLISH received struct mg_mqtt_message *
|
MG_EV_MQTT_MSG, // MQTT PUBLISH received struct mg_mqtt_message *
|
||||||
MG_EV_MQTT_OPEN, // MQTT CONNACK received int *connack_status_code
|
MG_EV_MQTT_OPEN, // MQTT CONNACK received int *connack_status_code
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ enum {
|
|||||||
MG_EV_HTTP_MSG, // HTTP request/response struct mg_http_message *
|
MG_EV_HTTP_MSG, // HTTP request/response struct mg_http_message *
|
||||||
MG_EV_WS_OPEN, // Websocket handshake done NULL
|
MG_EV_WS_OPEN, // Websocket handshake done NULL
|
||||||
MG_EV_WS_MSG, // Websocket message received struct mg_ws_message *
|
MG_EV_WS_MSG, // Websocket message received struct mg_ws_message *
|
||||||
|
MG_EV_WS_CTL, // Websocket control message struct mg_ws_message *
|
||||||
MG_EV_MQTT_CMD, // MQTT low-level command struct mg_mqtt_message *
|
MG_EV_MQTT_CMD, // MQTT low-level command struct mg_mqtt_message *
|
||||||
MG_EV_MQTT_MSG, // MQTT PUBLISH received struct mg_mqtt_message *
|
MG_EV_MQTT_MSG, // MQTT PUBLISH received struct mg_mqtt_message *
|
||||||
MG_EV_MQTT_OPEN, // MQTT CONNACK received int *connack_status_code
|
MG_EV_MQTT_OPEN, // MQTT CONNACK received int *connack_status_code
|
||||||
|
|||||||
+1
-1
@@ -169,7 +169,7 @@ int mg_http_parse(const char *s, size_t len, struct mg_http_message *hm) {
|
|||||||
mg_http_parse_headers(s, end, hm->headers,
|
mg_http_parse_headers(s, end, hm->headers,
|
||||||
sizeof(hm->headers) / sizeof(hm->headers[0]));
|
sizeof(hm->headers) / sizeof(hm->headers[0]));
|
||||||
if ((cl = mg_http_get_header(hm, "Content-Length")) != NULL) {
|
if ((cl = mg_http_get_header(hm, "Content-Length")) != NULL) {
|
||||||
hm->body.len = (size_t) mg_to64(cl->ptr);
|
hm->body.len = (size_t) mg_to64(*cl);
|
||||||
hm->message.len = req_len + hm->body.len;
|
hm->message.len = req_len + hm->body.len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-6
@@ -215,14 +215,15 @@ int mg_asprintf(char **buf, size_t size, const char *fmt, ...) {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t mg_to64(const char *s) {
|
int64_t mg_to64(struct mg_str str) {
|
||||||
int64_t result = 0, neg = 1;
|
int64_t result = 0, neg = 1;
|
||||||
while (*s && isspace((unsigned char) *s)) s++;
|
size_t i = 0;
|
||||||
if (*s == '-') neg = -1, s++;
|
while (i < str.len && (str.ptr[i] == ' ' || str.ptr[i] == '\t')) i++;
|
||||||
while (isdigit((unsigned char) *s)) {
|
if (i < str.len && str.ptr[i] == '-') neg = -1, i++;
|
||||||
|
while (i < str.len && str.ptr[i] >= '0' && str.ptr[i] <= '9') {
|
||||||
result *= 10;
|
result *= 10;
|
||||||
result += (*s - '0');
|
result += (str.ptr[i] - '0');
|
||||||
s++;
|
i++;
|
||||||
}
|
}
|
||||||
return result * neg;
|
return result * neg;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ void mg_unhex(const char *buf, int len, unsigned char *to);
|
|||||||
unsigned long mg_unhexn(const char *s, int len);
|
unsigned long mg_unhexn(const char *s, int len);
|
||||||
int mg_asprintf(char **buf, size_t size, const char *fmt, ...);
|
int mg_asprintf(char **buf, size_t size, const char *fmt, ...);
|
||||||
int mg_vasprintf(char **buf, size_t size, const char *fmt, va_list ap);
|
int mg_vasprintf(char **buf, size_t size, const char *fmt, va_list ap);
|
||||||
int64_t mg_to64(const char *s);
|
int64_t mg_to64(struct mg_str str);
|
||||||
double mg_time(void);
|
double mg_time(void);
|
||||||
unsigned long mg_millis(void);
|
unsigned long mg_millis(void);
|
||||||
void mg_usleep(unsigned long usecs);
|
void mg_usleep(unsigned long usecs);
|
||||||
|
|||||||
@@ -128,24 +128,23 @@ static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
|
|||||||
|
|
||||||
while (ws_process(c->recv.buf, c->recv.len, &msg) > 0) {
|
while (ws_process(c->recv.buf, c->recv.len, &msg) > 0) {
|
||||||
char *s = (char *) c->recv.buf + msg.header_len;
|
char *s = (char *) c->recv.buf + msg.header_len;
|
||||||
|
struct mg_ws_message m = {{s, msg.data_len}, msg.flags};
|
||||||
switch (msg.flags & WEBSOCKET_FLAGS_MASK_OP) {
|
switch (msg.flags & WEBSOCKET_FLAGS_MASK_OP) {
|
||||||
case WEBSOCKET_OP_PING:
|
case WEBSOCKET_OP_PING:
|
||||||
LOG(LL_DEBUG, ("%s", "WS PONG"));
|
LOG(LL_DEBUG, ("%s", "WS PONG"));
|
||||||
mg_ws_send(c, s, msg.data_len, WEBSOCKET_OP_PONG);
|
mg_ws_send(c, s, msg.data_len, WEBSOCKET_OP_PONG);
|
||||||
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
break;
|
break;
|
||||||
case WEBSOCKET_OP_PONG:
|
case WEBSOCKET_OP_PONG:
|
||||||
// Ignore
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
break;
|
break;
|
||||||
case WEBSOCKET_OP_CLOSE: {
|
case WEBSOCKET_OP_CLOSE:
|
||||||
struct mg_ws_message evd = {{s, msg.data_len}, msg.flags};
|
|
||||||
LOG(LL_ERROR, ("%lu Got WS CLOSE", c->id));
|
LOG(LL_ERROR, ("%lu Got WS CLOSE", c->id));
|
||||||
mg_call(c, MG_EV_WS_MSG, &evd);
|
mg_call(c, MG_EV_WS_CTL, &m);
|
||||||
c->is_closing = 1;
|
c->is_closing = 1;
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
default: {
|
default: {
|
||||||
struct mg_ws_message evd = {{s, msg.data_len}, msg.flags};
|
mg_call(c, MG_EV_WS_MSG, &m);
|
||||||
mg_call(c, MG_EV_WS_MSG, &evd);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user