github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused events

Browse Source
pull/2735/head
Roger A. Light 3 years ago
parent fd330de080
commit da0eab36a4
6 changed files with 20 additions and 67 deletions
Show Stats Download Patch File Download Diff File

37
include/mosquitto_broker.h
Unescape Escape View File

@ -70,8 +70,8 @@ struct mosquitto_client {
char *username; char *username;
char *auth_method; char *auth_method;
struct mosquitto_message_v5 *will; struct mosquitto_message_v5 *will;
time_t will_delay_time; /* update */ time_t will_delay_time;
time_t session_expiry_time; /* update */ time_t session_expiry_time;
uint32_t will_delay_interval; uint32_t will_delay_interval;
uint32_t session_expiry_interval; uint32_t session_expiry_interval;
uint32_t max_packet_size; uint32_t max_packet_size;
@ -117,9 +117,9 @@ struct mosquitto_client_msg {
uint16_t mid; uint16_t mid;
uint8_t qos; uint8_t qos;
bool retain; bool retain;
bool dup; /* add, update */ bool dup;
uint8_t direction; uint8_t direction;
uint8_t state; /* add, update */ uint8_t state;
uint8_t padding[5]; uint8_t padding[5];
void *future2[8]; void *future2[8];
}; };
@ -147,22 +147,19 @@ enum mosquitto_plugin_event {
MOSQ_EVT_SUBSCRIBE = 12, MOSQ_EVT_SUBSCRIBE = 12,
MOSQ_EVT_UNSUBSCRIBE = 13, MOSQ_EVT_UNSUBSCRIBE = 13,
MOSQ_EVT_PERSIST_RESTORE = 14, MOSQ_EVT_PERSIST_RESTORE = 14,
MOSQ_EVT_PERSIST_CONFIG_ADD = 15, MOSQ_EVT_PERSIST_BASE_MSG_ADD = 15,
MOSQ_EVT_PERSIST_BASE_MSG_ADD = 16, MOSQ_EVT_PERSIST_BASE_MSG_DELETE = 16,
MOSQ_EVT_PERSIST_BASE_MSG_DELETE = 17, MOSQ_EVT_PERSIST_RETAIN_MSG_SET = 17,
MOSQ_EVT_PERSIST_BASE_MSG_LOAD = 18, MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE = 18,
MOSQ_EVT_PERSIST_RETAIN_MSG_SET = 19, MOSQ_EVT_PERSIST_CLIENT_ADD = 19,
MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE = 20, MOSQ_EVT_PERSIST_CLIENT_DELETE = 20,
MOSQ_EVT_PERSIST_CLIENT_ADD = 21, MOSQ_EVT_PERSIST_CLIENT_UPDATE = 21,
MOSQ_EVT_PERSIST_CLIENT_DELETE = 22, MOSQ_EVT_PERSIST_SUBSCRIPTION_ADD = 22,
MOSQ_EVT_PERSIST_CLIENT_UPDATE = 23, MOSQ_EVT_PERSIST_SUBSCRIPTION_DELETE = 23,
MOSQ_EVT_PERSIST_SUBSCRIPTION_ADD = 24, MOSQ_EVT_PERSIST_CLIENT_MSG_ADD = 24,
MOSQ_EVT_PERSIST_SUBSCRIPTION_DELETE = 25, MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE = 25,
MOSQ_EVT_PERSIST_CLIENT_MSG_ADD = 26, MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE = 26,
MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE = 27, MOSQ_EVT_MESSAGE_OUT = 27,
MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE = 28,
MOSQ_EVT_PERSIST_CLIENT_MSG_LOAD = 29,
MOSQ_EVT_MESSAGE_OUT = 30,
}; };
/* Data for the MOSQ_EVT_RELOAD event */ /* Data for the MOSQ_EVT_RELOAD event */

9
plugins/examples/plugin-event-stats/mosquitto_plugin_event_stats.c
Unescape Escape View File

@ -41,7 +41,7 @@ Contributors:
#define PLUGIN_NAME "plugin-event-stats" #define PLUGIN_NAME "plugin-event-stats"
#define PLUGIN_VERSION "1.0" #define PLUGIN_VERSION "1.0"
#define MAX_EVT MOSQ_EVT_PERSIST_CLIENT_MSG_LOAD #define MAX_EVT MOSQ_EVT_MESSAGE_OUT
MOSQUITTO_PLUGIN_DECLARE_VERSION(5); MOSQUITTO_PLUGIN_DECLARE_VERSION(5);
static mosquitto_plugin_id_t *mosq_pid = NULL; static mosquitto_plugin_id_t *mosq_pid = NULL;
@ -60,19 +60,16 @@ const char evt_topics[][60] = {
TOPIC_BASE "auth/ext/start", /* MOSQ_EVT_EXT_AUTH_START */ TOPIC_BASE "auth/ext/start", /* MOSQ_EVT_EXT_AUTH_START */
TOPIC_BASE "auth/ext/continue", /* MOSQ_EVT_EXT_AUTH_CONTINUE */ TOPIC_BASE "auth/ext/continue", /* MOSQ_EVT_EXT_AUTH_CONTINUE */
TOPIC_BASE "control", /* MOSQ_EVT_CONTROL */ TOPIC_BASE "control", /* MOSQ_EVT_CONTROL */
TOPIC_BASE "message", /* MOSQ_EVT_MESSAGE_WRITE */ TOPIC_BASE "message/in", /* MOSQ_EVT_MESSAGE_IN */
TOPIC_BASE "psk_key", /* MOSQ_EVT_PSK_KEY */ TOPIC_BASE "psk_key", /* MOSQ_EVT_PSK_KEY */
TOPIC_BASE "tick", /* MOSQ_EVT_TICK */ TOPIC_BASE "tick", /* MOSQ_EVT_TICK */
TOPIC_BASE "disconnect", /* MOSQ_EVT_DISCONNECT */ TOPIC_BASE "disconnect", /* MOSQ_EVT_DISCONNECT */
TOPIC_BASE "connect", /* MOSQ_EVT_CONNECT */ TOPIC_BASE "connect", /* MOSQ_EVT_CONNECT */
TOPIC_BASE "message_read", /* MOSQ_EVT_MESSAGE_READ */
TOPIC_BASE "subscribe", /* MOSQ_EVT_SUBSCRIBE */ TOPIC_BASE "subscribe", /* MOSQ_EVT_SUBSCRIBE */
TOPIC_BASE "unsubscribe", /* MOSQ_EVT_UNSUBSCRIBE */ TOPIC_BASE "unsubscribe", /* MOSQ_EVT_UNSUBSCRIBE */
TOPIC_BASE "persist/restore", /* MOSQ_EVT_PERSIST_RESTORE */ TOPIC_BASE "persist/restore", /* MOSQ_EVT_PERSIST_RESTORE */
TOPIC_BASE "persist/config/add", /* MOSQ_EVT_PERSIST_CONFIG_ADD */
TOPIC_BASE "persist/message/base/add", /* MOSQ_EVT_PERSIST_MSG_ADD */ TOPIC_BASE "persist/message/base/add", /* MOSQ_EVT_PERSIST_MSG_ADD */
TOPIC_BASE "persist/message/base/delete", /* MOSQ_EVT_PERSIST_MSG_DELETE */ TOPIC_BASE "persist/message/base/delete", /* MOSQ_EVT_PERSIST_MSG_DELETE */
TOPIC_BASE "persist/message/base/load", /* MOSQ_EVT_PERSIST_MSG_LOAD */
TOPIC_BASE "persist/message/retain/set", /* MOSQ_EVT_PERSIST_RETAIN_SET */ TOPIC_BASE "persist/message/retain/set", /* MOSQ_EVT_PERSIST_RETAIN_SET */
TOPIC_BASE "persist/message/retain/delete", /* MOSQ_EVT_PERSIST_RETAIN_DELETE */ TOPIC_BASE "persist/message/retain/delete", /* MOSQ_EVT_PERSIST_RETAIN_DELETE */
TOPIC_BASE "persist/client/add", /* MOSQ_EVT_PERSIST_CLIENT_ADD */ TOPIC_BASE "persist/client/add", /* MOSQ_EVT_PERSIST_CLIENT_ADD */
@ -83,7 +80,7 @@ const char evt_topics[][60] = {
TOPIC_BASE "persist/message/client/add", /* MOSQ_EVT_PERSIST_CLIENT_MSG_ADD */ TOPIC_BASE "persist/message/client/add", /* MOSQ_EVT_PERSIST_CLIENT_MSG_ADD */
TOPIC_BASE "persist/message/client/delete", /* MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE */ TOPIC_BASE "persist/message/client/delete", /* MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE */
TOPIC_BASE "persist/message/client/update", /* MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE */ TOPIC_BASE "persist/message/client/update", /* MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE */
TOPIC_BASE "persist/message/client/load", /* MOSQ_EVT_PERSIST_CLIENT_MSG_LOAD */ TOPIC_BASE "message/out", /* MOSQ_EVT_MESSAGE_OUT */
}; };
static int callback_tick(int event, void *event_data, void *userdata) static int callback_tick(int event, void *event_data, void *userdata)

27
plugins/persist-sqlite/base_msgs.c
Unescape Escape View File

@ -215,30 +215,3 @@ int persist_sqlite__base_msg_remove_cb(int event, void *event_data, void *userda
return rc; return rc;
} }
int persist_sqlite__base_msg_load_cb(int event, void *event_data, void *userdata)
{
struct mosquitto_evt_persist_base_msg *ed = event_data;
struct mosquitto_sqlite *ms = userdata;
UNUSED(event);
if(sqlite3_bind_int64(ms->base_msg_load_stmt, 1, (int64_t)ed->data.store_id) == SQLITE_OK){
if(sqlite3_step(ms->base_msg_load_stmt) == SQLITE_ROW){
ed->data.expiry_time = (time_t)sqlite3_column_int64(ms->base_msg_load_stmt, 1);
ed->data.topic = (char *)sqlite3_column_text(ms->base_msg_load_stmt, 2);
ed->data.payload = (void *)sqlite3_column_blob(ms->base_msg_load_stmt, 3);
ed->data.source_id = (char *)sqlite3_column_text(ms->base_msg_load_stmt, 4);
ed->data.source_username = (char *)sqlite3_column_text(ms->base_msg_load_stmt, 5);
ed->data.payloadlen = (uint32_t)sqlite3_column_int(ms->base_msg_load_stmt, 6);
ed->data.source_mid = (uint16_t)sqlite3_column_int(ms->base_msg_load_stmt, 7);
ed->data.source_port = (uint16_t)sqlite3_column_int(ms->base_msg_load_stmt, 8);
ed->data.qos = (uint8_t)sqlite3_column_int(ms->base_msg_load_stmt, 9);
ed->data.retain = sqlite3_column_int(ms->base_msg_load_stmt, 10);
mosquitto_persist_base_msg_add(&ed->data);
}
}
sqlite3_finalize(ms->base_msg_load_stmt);
return MOSQ_ERR_SUCCESS;
}

4
plugins/persist-sqlite/plugin.c
Unescape Escape View File

@ -145,8 +145,6 @@ int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier, void **user_data, s
if(rc) goto fail; if(rc) goto fail;
rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_DELETE, persist_sqlite__base_msg_remove_cb, NULL, &plg_data); rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_DELETE, persist_sqlite__base_msg_remove_cb, NULL, &plg_data);
if(rc) goto fail; if(rc) goto fail;
rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_LOAD, persist_sqlite__base_msg_load_cb, NULL, &plg_data);
if(rc) goto fail;
rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_SET, persist_sqlite__retain_msg_set_cb, NULL, &plg_data); rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_SET, persist_sqlite__retain_msg_set_cb, NULL, &plg_data);
if(rc) goto fail; if(rc) goto fail;
rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE, persist_sqlite__retain_msg_remove_cb, NULL, &plg_data); rc = mosquitto_callback_register(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE, persist_sqlite__retain_msg_remove_cb, NULL, &plg_data);
@ -193,8 +191,6 @@ int mosquitto_plugin_cleanup(void *user_data, struct mosquitto_opt *options, int
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_RESTORE, persist_sqlite__restore_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_RESTORE, persist_sqlite__restore_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_ADD, persist_sqlite__base_msg_add_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_ADD, persist_sqlite__base_msg_add_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_DELETE, persist_sqlite__base_msg_remove_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_DELETE, persist_sqlite__base_msg_remove_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_BASE_MSG_LOAD, persist_sqlite__base_msg_load_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_SET, persist_sqlite__retain_msg_set_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE, persist_sqlite__retain_msg_remove_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE, persist_sqlite__retain_msg_remove_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_CLIENT_ADD, persist_sqlite__client_add_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_CLIENT_ADD, persist_sqlite__client_add_cb, NULL);
mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_CLIENT_DELETE, persist_sqlite__client_remove_cb, NULL); mosquitto_callback_unregister(plg_id, MOSQ_EVT_PERSIST_CLIENT_DELETE, persist_sqlite__client_remove_cb, NULL);

2
src/mosquitto_broker_internal.h
Unescape Escape View File

@ -180,10 +180,8 @@ struct plugin__callbacks{
struct mosquitto__callback *persist_client_msg_add; struct mosquitto__callback *persist_client_msg_add;
struct mosquitto__callback *persist_client_msg_delete; struct mosquitto__callback *persist_client_msg_delete;
struct mosquitto__callback *persist_client_msg_update; struct mosquitto__callback *persist_client_msg_update;
struct mosquitto__callback *persist_client_msg_load;
struct mosquitto__callback *persist_base_msg_add; struct mosquitto__callback *persist_base_msg_add;
struct mosquitto__callback *persist_base_msg_delete; struct mosquitto__callback *persist_base_msg_delete;
struct mosquitto__callback *persist_base_msg_load;
struct mosquitto__callback *persist_retain_msg_set; struct mosquitto__callback *persist_retain_msg_set;
struct mosquitto__callback *persist_retain_msg_delete; struct mosquitto__callback *persist_retain_msg_delete;
}; };

8
src/plugin_callbacks.c
Unescape Escape View File

@ -59,8 +59,6 @@ static const char *get_event_name(int event)
return "persist-base-msg-add"; return "persist-base-msg-add";
case MOSQ_EVT_PERSIST_BASE_MSG_DELETE: case MOSQ_EVT_PERSIST_BASE_MSG_DELETE:
return "persist-base-msg-delete"; return "persist-base-msg-delete";
case MOSQ_EVT_PERSIST_BASE_MSG_LOAD:
return "persist-base-msg-load";
case MOSQ_EVT_PERSIST_RETAIN_MSG_SET: case MOSQ_EVT_PERSIST_RETAIN_MSG_SET:
return "persist-retain-msg-set"; return "persist-retain-msg-set";
case MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE: case MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE:
@ -81,8 +79,6 @@ static const char *get_event_name(int event)
return "persist-client-msg-delete"; return "persist-client-msg-delete";
case MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE: case MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE:
return "persist-client-msg-update"; return "persist-client-msg-update";
case MOSQ_EVT_PERSIST_CLIENT_MSG_LOAD:
return "persist-client-msg-load";
default: default:
return ""; return "";
} }
@ -145,16 +141,12 @@ static struct mosquitto__callback **plugin__get_callback_base(struct mosquitto__
return &security_options->plugin_callbacks.persist_client_msg_add; return &security_options->plugin_callbacks.persist_client_msg_add;
case MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE: case MOSQ_EVT_PERSIST_CLIENT_MSG_DELETE:
return &security_options->plugin_callbacks.persist_client_msg_delete; return &security_options->plugin_callbacks.persist_client_msg_delete;
case MOSQ_EVT_PERSIST_CLIENT_MSG_LOAD:
return &security_options->plugin_callbacks.persist_client_msg_load;
case MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE: case MOSQ_EVT_PERSIST_CLIENT_MSG_UPDATE:
return &security_options->plugin_callbacks.persist_client_msg_update; return &security_options->plugin_callbacks.persist_client_msg_update;
case MOSQ_EVT_PERSIST_BASE_MSG_ADD: case MOSQ_EVT_PERSIST_BASE_MSG_ADD:
return &security_options->plugin_callbacks.persist_base_msg_add; return &security_options->plugin_callbacks.persist_base_msg_add;
case MOSQ_EVT_PERSIST_BASE_MSG_DELETE: case MOSQ_EVT_PERSIST_BASE_MSG_DELETE:
return &security_options->plugin_callbacks.persist_base_msg_delete; return &security_options->plugin_callbacks.persist_base_msg_delete;
case MOSQ_EVT_PERSIST_BASE_MSG_LOAD:
return &security_options->plugin_callbacks.persist_base_msg_load;
case MOSQ_EVT_PERSIST_RETAIN_MSG_SET: case MOSQ_EVT_PERSIST_RETAIN_MSG_SET:
return &security_options->plugin_callbacks.persist_retain_msg_set; return &security_options->plugin_callbacks.persist_retain_msg_set;
case MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE: case MOSQ_EVT_PERSIST_RETAIN_MSG_DELETE:

Write Preview
Loading…
Cancel
Save