From 7d7bb3b3886ccef82253ac22b4f84b8532673a8d Mon Sep 17 00:00:00 2001
From: Julien Ammous <schmurfy@gmail.com>
Date: Mon, 29 Jan 2018 22:02:38 +0200
Subject: [PATCH] Don't use user_data in mqtt server
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
---
examples/mqtt_broker/mqtt_broker.c | 2 +-
mongoose.c | 21 ++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/examples/mqtt_broker/mqtt_broker.c b/examples/mqtt_broker/mqtt_broker.c
index 4cc5185b5..f1782ef2c 100644
--- a/examples/mqtt_broker/mqtt_broker.c
+++ b/examples/mqtt_broker/mqtt_broker.c
@@ -38,7 +38,7 @@ int main(void) {
exit(EXIT_FAILURE);
}
mg_mqtt_broker_init(&brk, NULL);
- c->user_data = &brk;
+ c->priv_2 = &brk;
mg_set_protocol_mqtt(c);
printf("MQTT broker started on %s\n", s_listening_address);
diff --git a/mongoose.c b/mongoose.c
index 65342b374..7ff013315 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -10856,8 +10856,7 @@ static void mg_mqtt_broker_handle_connect(struct mg_mqtt_broker *brk,
/* TODO(mkm): check header (magic and version) */
mg_mqtt_session_init(brk, s, nc);
- s->user_data = nc->user_data;
- nc->user_data = s;
+ nc->priv_2 = s;
mg_mqtt_add_session(s);
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,
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];
size_t num_subs = 0;
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;
if (nc->listener) {
- brk = (struct mg_mqtt_broker *) nc->listener->user_data;
+ brk = (struct mg_mqtt_broker *) nc->listener->priv_2;
} else {
- brk = (struct mg_mqtt_broker *) nc->user_data;
+ brk = (struct mg_mqtt_broker *) nc->priv_2;
}
switch (ev) {
case MG_EV_ACCEPT:
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;
case MG_EV_MQTT_CONNECT:
- if (nc->user_data == NULL) {
+ if (nc->priv_2 == NULL) {
mg_mqtt_broker_handle_connect(brk, nc);
} else {
/* Repeated CONNECT */
@@ -10962,7 +10961,7 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
}
break;
case MG_EV_MQTT_SUBSCRIBE:
- if (nc->user_data != NULL) {
+ if (nc->priv_2 != NULL) {
mg_mqtt_broker_handle_subscribe(nc, msg);
} else {
/* Subscribe before CONNECT */
@@ -10970,7 +10969,7 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
}
break;
case MG_EV_MQTT_PUBLISH:
- if (nc->user_data != NULL) {
+ if (nc->priv_2 != NULL) {
mg_mqtt_broker_handle_publish(brk, msg);
} else {
/* Publish before CONNECT */
@@ -10978,8 +10977,8 @@ void mg_mqtt_broker(struct mg_connection *nc, int ev, void *data) {
}
break;
case MG_EV_CLOSE:
- if (nc->listener && nc->user_data != NULL) {
- mg_mqtt_close_session((struct mg_mqtt_session *) nc->user_data);
+ if (nc->listener && nc->priv_2 != NULL) {
+ mg_mqtt_close_session((struct mg_mqtt_session *) nc->priv_2);
}
break;
}
--
GitLab