wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-14 19:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use user_data in mqtt server

Browse Source 
Integrates https://github.com/cesanta/mongoose/pull/884
Closes https://github.com/cesanta/mongoose/issues/883

CL: Mongoose Web Server: Don't use user_data in mqtt server

PUBLISHED_FROM=7785784a766e0ba7514bbba604cde14e7bad3f73
This commit is contained in:
Julien Ammous authored and Cesanta Bot committed 2018-01-30 19:39:05 +00:00
1 parent 0b4bf13335
commit 7d7bb3b388
2 files changed
+11 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/mqtt_broker/mqtt_broker.c
+1 -1
View File
@@ -38,7 +38,7 @@ int main(void) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
mg_mqtt_broker_init(&brk, NULL); mg_mqtt_broker_init(&brk, NULL);
c->user_data = &brk; c->priv_2 = &brk;
mg_set_protocol_mqtt(c); mg_set_protocol_mqtt(c);
printf("MQTT broker started on %s\n", s_listening_address); printf("MQTT broker started on %s\n", s_listening_address);
mongoose.c
+10 -11
View File
@@ -10856,8 +10856,7 @@ static void mg_mqtt_broker_handle_connect(struct mg_mqtt_broker *brk,
/* TODO(mkm): check header (magic and version) */ /* TODO(mkm): check header (magic and version) */
mg_mqtt_session_init(brk, s, nc); mg_mqtt_session_init(brk, s, nc);
s->user_data = nc->user_data; nc->priv_2 = s;
nc->user_data = s;
mg_mqtt_add_session(s); mg_mqtt_add_session(s);
mg_mqtt_connack(nc, MG_EV_MQTT_CONNACK_ACCEPTED); mg_mqtt_connack(nc, MG_EV_MQTT_CONNACK_ACCEPTED);
@@ -10865,7 +10864,7 @@ static void mg_mqtt_broker_handle_connect(struct mg_mqtt_broker *brk,
static void mg_mqtt_broker_handle_subscribe(struct mg_connection *nc, static void mg_mqtt_broker_handle_subscribe(struct mg_connection *nc,
struct mg_mqtt_message *msg) { struct mg_mqtt_message *msg) {
struct mg_mqtt_session *ss = (struct mg_mqtt_session *) nc->user_data; struct mg_mqtt_session *ss = (struct mg_mqtt_session *) nc->priv_2;
uint8_t qoss[MG_MQTT_MAX_SESSION_SUBSCRIPTIONS]; uint8_t qoss[MG_MQTT_MAX_SESSION_SUBSCRIPTIONS];
size_t num_subs = 0; size_t num_subs = 0;
struct mg_str topic; struct mg_str topic;
@@ -10943,18 +10942,18 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
struct mg_mqtt_broker *brk; struct mg_mqtt_broker *brk;
if (nc->listener) { if (nc->listener) {
brk = (struct mg_mqtt_broker *) nc->listener->user_data; brk = (struct mg_mqtt_broker *) nc->listener->priv_2;
} else { } else {
brk = (struct mg_mqtt_broker *) nc->user_data; brk = (struct mg_mqtt_broker *) nc->priv_2;
} }
switch (ev) { switch (ev) {
case MG_EV_ACCEPT: case MG_EV_ACCEPT:
if (nc->proto_data == NULL) mg_set_protocol_mqtt(nc); if (nc->proto_data == NULL) mg_set_protocol_mqtt(nc);
nc->user_data = NULL; /* Clear up the inherited pointer to broker */ nc->priv_2 = NULL; /* Clear up the inherited pointer to broker */
break; break;
case MG_EV_MQTT_CONNECT: case MG_EV_MQTT_CONNECT:
if (nc->user_data == NULL) { if (nc->priv_2 == NULL) {
mg_mqtt_broker_handle_connect(brk, nc); mg_mqtt_broker_handle_connect(brk, nc);
} else { } else {
/* Repeated CONNECT */ /* Repeated CONNECT */
@@ -10962,7 +10961,7 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
} }
break; break;
case MG_EV_MQTT_SUBSCRIBE: case MG_EV_MQTT_SUBSCRIBE:
if (nc->user_data != NULL) { if (nc->priv_2 != NULL) {
mg_mqtt_broker_handle_subscribe(nc, msg); mg_mqtt_broker_handle_subscribe(nc, msg);
} else { } else {
/* Subscribe before CONNECT */ /* Subscribe before CONNECT */
@@ -10970,7 +10969,7 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
} }
break; break;
case MG_EV_MQTT_PUBLISH: case MG_EV_MQTT_PUBLISH:
if (nc->user_data != NULL) { if (nc->priv_2 != NULL) {
mg_mqtt_broker_handle_publish(brk, msg); mg_mqtt_broker_handle_publish(brk, msg);
} else { } else {
/* Publish before CONNECT */ /* Publish before CONNECT */
@@ -10978,8 +10977,8 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
} }
break; break;
case MG_EV_CLOSE: case MG_EV_CLOSE:
if (nc->listener && nc->user_data != NULL) { if (nc->listener && nc->priv_2 != NULL) {
mg_mqtt_close_session((struct mg_mqtt_session *) nc->user_data); mg_mqtt_close_session((struct mg_mqtt_session *) nc->priv_2);
} }
break; break;
} }