diff --git a/include/neuron/msg.h b/include/neuron/msg.h index 0ce592b4..47a82982 100644 --- a/include/neuron/msg.h +++ b/include/neuron/msg.h @@ -137,16 +137,6 @@ typedef enum neu_reqresp_type { NEU_REQ_UPDATE_LOG_LEVEL, - NEU_REQ_ADD_NODE_EVENT, - NEU_REQ_DEL_NODE_EVENT, - NEU_REQ_NODE_CTL_EVENT, - NEU_REQ_NODE_SETTING_EVENT, - NEU_REQ_ADD_GROUP_EVENT, - NEU_REQ_DEL_GROUP_EVENT, - NEU_REQ_UPDATE_GROUP_EVENT, - NEU_REQ_ADD_TAG_EVENT, - NEU_REQ_DEL_TAG_EVENT, - NEU_REQ_UPDATE_TAG_EVENT, } neu_reqresp_type_e; static const char *neu_reqresp_type_string_t[] = { @@ -246,17 +236,6 @@ static const char *neu_reqresp_type_string_t[] = { [NEU_RESP_GET_NDRIVER_TAGS] = "NEU_RESP_GET_NDRIVER_TAGS", [NEU_REQ_UPDATE_LOG_LEVEL] = "NEU_REQ_UPDATE_LOG_LEVEL", - - [NEU_REQ_ADD_NODE_EVENT] = "NEU_REQ_ADD_NODE_EVENT", - [NEU_REQ_DEL_NODE_EVENT] = "NEU_REQ_DEL_NODE_EVENT", - [NEU_REQ_NODE_CTL_EVENT] = "NEU_REQ_NODE_CTL_EVENT", - [NEU_REQ_NODE_SETTING_EVENT] = "NEU_REQ_NODE_SETTING_EVENT", - [NEU_REQ_ADD_GROUP_EVENT] = "NEU_REQ_ADD_GROUP_EVENT", - [NEU_REQ_DEL_GROUP_EVENT] = "NEU_REQ_DEL_GROUP_EVENT", - [NEU_REQ_UPDATE_GROUP_EVENT] = "NEU_REQ_UPDATE_GROUP_EVENT", - [NEU_REQ_ADD_TAG_EVENT] = "NEU_REQ_ADD_TAG_EVENT", - [NEU_REQ_DEL_TAG_EVENT] = "NEU_REQ_DEL_TAG_EVENT", - [NEU_REQ_UPDATE_TAG_EVENT] = "NEU_REQ_UPDATE_TAG_EVENT", }; inline static const char *neu_reqresp_type_string(neu_reqresp_type_e type) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 30126935..9d10bc25 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -681,16 +681,6 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_RESP_GET_GROUP: case NEU_RESP_ERROR: case NEU_REQRESP_NODES_STATE: - case NEU_REQ_ADD_NODE_EVENT: - case NEU_REQ_DEL_NODE_EVENT: - case NEU_REQ_NODE_CTL_EVENT: - case NEU_REQ_NODE_SETTING_EVENT: - case NEU_REQ_ADD_GROUP_EVENT: - case NEU_REQ_DEL_GROUP_EVENT: - case NEU_REQ_UPDATE_GROUP_EVENT: - case NEU_REQ_ADD_TAG_EVENT: - case NEU_REQ_DEL_TAG_EVENT: - case NEU_REQ_UPDATE_TAG_EVENT: adapter->module->intf_funs->request( adapter->plugin, (neu_reqresp_head_t *) header, &header[1]); neu_msg_free(msg); diff --git a/src/base/msg_internal.h b/src/base/msg_internal.h index a12efdc2..5d5259a2 100644 --- a/src/base/msg_internal.h +++ b/src/base/msg_internal.h @@ -115,17 +115,7 @@ extern "C" { XX(NEU_REQ_UPDATE_NDRIVER_TAG_INFO, neu_req_update_ndriver_tag_info_t) \ XX(NEU_REQ_GET_NDRIVER_TAGS, neu_req_get_ndriver_tags_t) \ XX(NEU_RESP_GET_NDRIVER_TAGS, neu_resp_get_ndriver_tags_t) \ - XX(NEU_REQ_UPDATE_LOG_LEVEL, neu_req_update_log_level_t) \ - XX(NEU_REQ_ADD_NODE_EVENT, neu_req_add_node_t) \ - XX(NEU_REQ_DEL_NODE_EVENT, neu_req_del_node_t) \ - XX(NEU_REQ_NODE_CTL_EVENT, neu_req_node_ctl_t) \ - XX(NEU_REQ_NODE_SETTING_EVENT, neu_req_node_setting_t) \ - XX(NEU_REQ_ADD_GROUP_EVENT, neu_req_add_group_t) \ - XX(NEU_REQ_DEL_GROUP_EVENT, neu_req_del_group_t) \ - XX(NEU_REQ_UPDATE_GROUP_EVENT, neu_req_update_group_t) \ - XX(NEU_REQ_ADD_TAG_EVENT, neu_req_add_tag_t) \ - XX(NEU_REQ_DEL_TAG_EVENT, neu_req_del_tag_t) \ - XX(NEU_REQ_UPDATE_TAG_EVENT, neu_req_update_tag_t) + XX(NEU_REQ_UPDATE_LOG_LEVEL, neu_req_update_log_level_t) static inline size_t neu_reqresp_size(neu_reqresp_type_e t) { diff --git a/src/core/manager.c b/src/core/manager.c index 4f0ad11b..9a3bcdb3 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1306,20 +1306,6 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) break; } - case NEU_REQ_ADD_NODE_EVENT: - case NEU_REQ_DEL_NODE_EVENT: - case NEU_REQ_NODE_CTL_EVENT: - case NEU_REQ_NODE_SETTING_EVENT: - case NEU_REQ_ADD_GROUP_EVENT: - case NEU_REQ_DEL_GROUP_EVENT: - case NEU_REQ_UPDATE_GROUP_EVENT: - case NEU_REQ_ADD_TAG_EVENT: - case NEU_REQ_DEL_TAG_EVENT: - case NEU_REQ_UPDATE_TAG_EVENT: { - neu_msg_free(msg); - break; - } - case NEU_REQ_UPDATE_GROUP: { neu_resp_error_t e = { 0 };