GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-29 23:19:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(mqtt-client): update client interface

Browse Source 
1. Change constructor neu_mqtt_client_new to take only version argument
  2. Add constructor new_mqtt_client_from_addr
  3. Add method neu_mqtt_client_set_addr
This commit is contained in:
eeff
2022-11-18 16:36:10 +08:00
parent c76feca0e6
commit 341c54d388
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/neuron/connection/mqtt_client.h
+5 -2
View File
@@ -48,13 +48,16 @@ typedef enum {
typedef struct neu_mqtt_client_s neu_mqtt_client_t;
neu_mqtt_client_t *neu_mqtt_client_new(const char *host, uint16_t port,
neu_mqtt_version_e version);
neu_mqtt_client_t *neu_mqtt_client_new(neu_mqtt_version_e version);
neu_mqtt_client_t *neu_mqtt_client_from_addr(const char *host, uint16_t port,
neu_mqtt_version_e version);
void neu_mqtt_client_free(neu_mqtt_client_t *client);
bool neu_mqtt_client_is_opened(neu_mqtt_client_t *client);
bool neu_mqtt_client_is_connected(neu_mqtt_client_t *client);
int neu_mqtt_client_set_addr(neu_mqtt_client_t *client, const char *host,
uint16_t port);
int neu_mqtt_client_set_user(neu_mqtt_client_t *client, const char *username,
const char *password);
int neu_mqtt_client_set_connect_cb(neu_mqtt_client_t * client,
src/connection/mqtt_client.c
+33 -12
View File
@@ -509,35 +509,40 @@ alloc_sqlite_config(neu_mqtt_client_t *client)
return cfg;
}
neu_mqtt_client_t *neu_mqtt_client_new(const char *host, uint16_t port,
neu_mqtt_version_e version)
neu_mqtt_client_t *neu_mqtt_client_new(neu_mqtt_version_e version)
{
char *url = NULL;
neu_asprintf(&url, "mqtt-tcp://%s:%" PRIu16, host, port);
if (NULL == url) {
return NULL;
}
neu_mqtt_client_t *client = calloc(1, sizeof(*client));
if (NULL == client) {
free(url);
return NULL;
}
client->conn_msg = alloc_conn_msg(client, version);
if (NULL == client->conn_msg) {
free(url);
return NULL;
}
client->url = url;
client->version = version;
client->task_limit = 1024;
return client;
}
neu_mqtt_client_t *neu_mqtt_client_from_addr(const char *host, uint16_t port,
neu_mqtt_version_e version)
{
neu_mqtt_client_t *client = neu_mqtt_client_new(version);
if (NULL == client) {
return NULL;
}
if (0 != neu_mqtt_client_set_addr(client, host, port)) {
neu_mqtt_client_free(client);
return NULL;
}
return client;
}
void neu_mqtt_client_free(neu_mqtt_client_t *client)
{
if (client) {
@@ -566,6 +571,22 @@ bool neu_mqtt_client_is_connected(neu_mqtt_client_t *client)
return client->connected;
}
int neu_mqtt_client_set_addr(neu_mqtt_client_t *client, const char *host,
uint16_t port)
{
char *url = NULL;
neu_asprintf(&url, "mqtt-tcp://%s:%" PRIu16, host, port);
if (NULL == url) {
log(error, "neu_asprintf address url fail");
return -1;
}
free(client->url);
client->url = url;
return 0;
}
int neu_mqtt_client_set_user(neu_mqtt_client_t *client, const char *username,
const char *password)
{