3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-27 06:51:04 +08:00
Code Issues Projects Releases Wiki Activity

Add user and pass to struct mg_mqtt_opts

Browse Source
This commit is contained in:
Sergey Lyubka 2021-10-31 12:48:32 +00:00
parent 03d187b147
commit 52be84f04e
4 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mongoose.c
View File

@ -2116,19 +2116,16 @@ static void mg_send_u16(struct mg_connection *c, uint16_t value) {
mg_send(c, &value, sizeof(value)); mg_send(c, &value, sizeof(value));
} }
void mg_mqtt_login(struct mg_connection *c, const char *url, void mg_mqtt_login(struct mg_connection *c, struct mg_mqtt_opts *opts) {
struct mg_mqtt_opts *opts) {
uint32_t total_len = 7 + 1 + 2 + 2; uint32_t total_len = 7 + 1 + 2 + 2;
uint16_t flags = (uint16_t) (((uint16_t) opts->qos & 3) << 3); uint16_t flags = (uint16_t) (((uint16_t) opts->qos & 3) << 3);
struct mg_str user = mg_url_user(url);
struct mg_str pass = mg_url_pass(url);
if (user.len > 0) { if (opts->user.len > 0) {
total_len += 2 + (uint32_t) user.len; total_len += 2 + (uint32_t) opts->user.len;
flags |= MQTT_HAS_USER_NAME; flags |= MQTT_HAS_USER_NAME;
} }
if (pass.len > 0) { if (opts->pass.len > 0) {
total_len += 2 + (uint32_t) pass.len; total_len += 2 + (uint32_t) opts->pass.len;
flags |= MQTT_HAS_PASSWORD; flags |= MQTT_HAS_PASSWORD;
} }
if (opts->will_topic.len > 0 && opts->will_message.len > 0) { if (opts->will_topic.len > 0 && opts->will_message.len > 0) {
@ -2153,13 +2150,13 @@ void mg_mqtt_login(struct mg_connection *c, const char *url,
mg_send_u16(c, mg_htons((uint16_t) opts->will_message.len)); mg_send_u16(c, mg_htons((uint16_t) opts->will_message.len));
mg_send(c, opts->will_message.ptr, opts->will_message.len); mg_send(c, opts->will_message.ptr, opts->will_message.len);
} }
if (user.len > 0) { if (opts->user.len > 0) {
mg_send_u16(c, mg_htons((uint16_t) user.len)); mg_send_u16(c, mg_htons((uint16_t) opts->user.len));
mg_send(c, user.ptr, user.len); mg_send(c, opts->user.ptr, opts->user.len);
} }
if (pass.len > 0) { if (opts->pass.len > 0) {
mg_send_u16(c, mg_htons((uint16_t) pass.len)); mg_send_u16(c, mg_htons((uint16_t) opts->pass.len));
mg_send(c, pass.ptr, pass.len); mg_send(c, opts->pass.ptr, opts->pass.len);
} }
} }
@ -2345,7 +2342,7 @@ struct mg_connection *mg_mqtt_connect(struct mg_mgr *mgr, const char *url,
if (c != NULL) { if (c != NULL) {
struct mg_mqtt_opts empty; struct mg_mqtt_opts empty;
memset(&empty, 0, sizeof(empty)); memset(&empty, 0, sizeof(empty));
mg_mqtt_login(c, url, opts == NULL ? &empty : opts); mg_mqtt_login(c, opts == NULL ? &empty : opts);
c->pfn = mqtt_cb; c->pfn = mqtt_cb;
} }
return c; return c;

5
mongoose.h
View File

@ -974,6 +974,8 @@ int mg_sntp_parse(const unsigned char *buf, size_t len, struct timeval *tv);
#define MQTT_SET_QOS(flags, qos) (flags) = ((flags) & ~0x6) | ((qos) << 1) #define MQTT_SET_QOS(flags, qos) (flags) = ((flags) & ~0x6) | ((qos) << 1)
struct mg_mqtt_opts { struct mg_mqtt_opts {
struct mg_str user; // Username, can be empty
struct mg_str pass; // Password, can be empty
struct mg_str client_id; // Client ID struct mg_str client_id; // Client ID
struct mg_str will_topic; // Will topic struct mg_str will_topic; // Will topic
struct mg_str will_message; // Will message struct mg_str will_message; // Will message
@ -998,8 +1000,7 @@ struct mg_connection *mg_mqtt_connect(struct mg_mgr *, const char *url,
mg_event_handler_t fn, void *fn_data); mg_event_handler_t fn, void *fn_data);
struct mg_connection *mg_mqtt_listen(struct mg_mgr *mgr, const char *url, struct mg_connection *mg_mqtt_listen(struct mg_mgr *mgr, const char *url,
mg_event_handler_t fn, void *fn_data); mg_event_handler_t fn, void *fn_data);
void mg_mqtt_login(struct mg_connection *c, const char *url, void mg_mqtt_login(struct mg_connection *c, struct mg_mqtt_opts *opts);
struct mg_mqtt_opts *opts);
void mg_mqtt_pub(struct mg_connection *c, struct mg_str *topic, void mg_mqtt_pub(struct mg_connection *c, struct mg_str *topic,
struct mg_str *data, int qos, bool retain); struct mg_str *data, int qos, bool retain);
void mg_mqtt_sub(struct mg_connection *, struct mg_str *topic, int qos); void mg_mqtt_sub(struct mg_connection *, struct mg_str *topic, int qos);

27
src/mqtt.c
View File

@ -33,19 +33,16 @@ static void mg_send_u16(struct mg_connection *c, uint16_t value) {
mg_send(c, &value, sizeof(value)); mg_send(c, &value, sizeof(value));
} }
void mg_mqtt_login(struct mg_connection *c, const char *url, void mg_mqtt_login(struct mg_connection *c, struct mg_mqtt_opts *opts) {
struct mg_mqtt_opts *opts) {
uint32_t total_len = 7 + 1 + 2 + 2; uint32_t total_len = 7 + 1 + 2 + 2;
uint16_t flags = (uint16_t) (((uint16_t) opts->qos & 3) << 3); uint16_t flags = (uint16_t) (((uint16_t) opts->qos & 3) << 3);
struct mg_str user = mg_url_user(url);
struct mg_str pass = mg_url_pass(url);
if (user.len > 0) { if (opts->user.len > 0) {
total_len += 2 + (uint32_t) user.len; total_len += 2 + (uint32_t) opts->user.len;
flags |= MQTT_HAS_USER_NAME; flags |= MQTT_HAS_USER_NAME;
} }
if (pass.len > 0) { if (opts->pass.len > 0) {
total_len += 2 + (uint32_t) pass.len; total_len += 2 + (uint32_t) opts->pass.len;
flags |= MQTT_HAS_PASSWORD; flags |= MQTT_HAS_PASSWORD;
} }
if (opts->will_topic.len > 0 && opts->will_message.len > 0) { if (opts->will_topic.len > 0 && opts->will_message.len > 0) {
@ -70,13 +67,13 @@ void mg_mqtt_login(struct mg_connection *c, const char *url,
mg_send_u16(c, mg_htons((uint16_t) opts->will_message.len)); mg_send_u16(c, mg_htons((uint16_t) opts->will_message.len));
mg_send(c, opts->will_message.ptr, opts->will_message.len); mg_send(c, opts->will_message.ptr, opts->will_message.len);
} }
if (user.len > 0) { if (opts->user.len > 0) {
mg_send_u16(c, mg_htons((uint16_t) user.len)); mg_send_u16(c, mg_htons((uint16_t) opts->user.len));
mg_send(c, user.ptr, user.len); mg_send(c, opts->user.ptr, opts->user.len);
} }
if (pass.len > 0) { if (opts->pass.len > 0) {
mg_send_u16(c, mg_htons((uint16_t) pass.len)); mg_send_u16(c, mg_htons((uint16_t) opts->pass.len));
mg_send(c, pass.ptr, pass.len); mg_send(c, opts->pass.ptr, opts->pass.len);
} }
} }
@ -262,7 +259,7 @@ struct mg_connection *mg_mqtt_connect(struct mg_mgr *mgr, const char *url,
if (c != NULL) { if (c != NULL) {
struct mg_mqtt_opts empty; struct mg_mqtt_opts empty;
memset(&empty, 0, sizeof(empty)); memset(&empty, 0, sizeof(empty));
mg_mqtt_login(c, url, opts == NULL ? &empty : opts); mg_mqtt_login(c, opts == NULL ? &empty : opts);
c->pfn = mqtt_cb; c->pfn = mqtt_cb;
} }
return c; return c;

5
src/mqtt.h
View File

@ -23,6 +23,8 @@
#define MQTT_SET_QOS(flags, qos) (flags) = ((flags) & ~0x6) | ((qos) << 1) #define MQTT_SET_QOS(flags, qos) (flags) = ((flags) & ~0x6) | ((qos) << 1)
struct mg_mqtt_opts { struct mg_mqtt_opts {
struct mg_str user; // Username, can be empty
struct mg_str pass; // Password, can be empty
struct mg_str client_id; // Client ID struct mg_str client_id; // Client ID
struct mg_str will_topic; // Will topic struct mg_str will_topic; // Will topic
struct mg_str will_message; // Will message struct mg_str will_message; // Will message
@ -47,8 +49,7 @@ struct mg_connection *mg_mqtt_connect(struct mg_mgr *, const char *url,
mg_event_handler_t fn, void *fn_data); mg_event_handler_t fn, void *fn_data);
struct mg_connection *mg_mqtt_listen(struct mg_mgr *mgr, const char *url, struct mg_connection *mg_mqtt_listen(struct mg_mgr *mgr, const char *url,
mg_event_handler_t fn, void *fn_data); mg_event_handler_t fn, void *fn_data);
void mg_mqtt_login(struct mg_connection *c, const char *url, void mg_mqtt_login(struct mg_connection *c, struct mg_mqtt_opts *opts);
struct mg_mqtt_opts *opts);
void mg_mqtt_pub(struct mg_connection *c, struct mg_str *topic, void mg_mqtt_pub(struct mg_connection *c, struct mg_str *topic,
struct mg_str *data, int qos, bool retain); struct mg_str *data, int qos, bool retain);
void mg_mqtt_sub(struct mg_connection *, struct mg_str *topic, int qos); void mg_mqtt_sub(struct mg_connection *, struct mg_str *topic, int qos);