diff --git a/include/neuron/adapter.h b/include/neuron/adapter.h index f848b7eb..1b479adc 100644 --- a/include/neuron/adapter.h +++ b/include/neuron/adapter.h @@ -76,7 +76,8 @@ typedef enum neu_reqresp_type { NEU_REQ_ADD_GROUP, NEU_REQ_DEL_GROUP, NEU_REQ_UPDATE_GROUP, - NEU_RESP_UPDATE_GROUP, + NEU_REQ_UPDATE_DRIVER_GROUP, + NEU_RESP_UPDATE_DRIVER_GROUP, NEU_REQ_GET_GROUP, NEU_RESP_GET_GROUP, NEU_REQ_GET_DRIVER_GROUP, @@ -179,14 +180,15 @@ static const char *neu_reqresp_type_string_t[] = { [NEU_REQ_NODE_RENAME] = "NEU_REQ_NODE_RENAME", [NEU_RESP_NODE_RENAME] = "NEU_RESP_NODE_RENAME", - [NEU_REQ_ADD_GROUP] = "NEU_REQ_ADD_GROUP", - [NEU_REQ_DEL_GROUP] = "NEU_REQ_DEL_GROUP", - [NEU_REQ_UPDATE_GROUP] = "NEU_REQ_UPDATE_GROUP", - [NEU_RESP_UPDATE_GROUP] = "NEU_RESP_UPDATE_GROUP", - [NEU_REQ_GET_GROUP] = "NEU_REQ_GET_GROUP", - [NEU_RESP_GET_GROUP] = "NEU_RESP_GET_GROUP", - [NEU_REQ_GET_DRIVER_GROUP] = "NEU_REQ_GET_DRIVER_GROUP", - [NEU_RESP_GET_DRIVER_GROUP] = "NEU_RESP_GET_DRIVER_GROUP", + [NEU_REQ_ADD_GROUP] = "NEU_REQ_ADD_GROUP", + [NEU_REQ_DEL_GROUP] = "NEU_REQ_DEL_GROUP", + [NEU_REQ_UPDATE_GROUP] = "NEU_REQ_UPDATE_GROUP", + [NEU_REQ_UPDATE_DRIVER_GROUP] = "NEU_REQ_UPDATE_DRIVER_GROUP", + [NEU_RESP_UPDATE_DRIVER_GROUP] = "NEU_RESP_UPDATE_DRIVER_GROUP", + [NEU_REQ_GET_GROUP] = "NEU_REQ_GET_GROUP", + [NEU_RESP_GET_GROUP] = "NEU_RESP_GET_GROUP", + [NEU_REQ_GET_DRIVER_GROUP] = "NEU_REQ_GET_DRIVER_GROUP", + [NEU_RESP_GET_DRIVER_GROUP] = "NEU_RESP_GET_DRIVER_GROUP", [NEU_REQ_ADD_TAG] = "NEU_REQ_ADD_TAG", [NEU_RESP_ADD_TAG] = "NEU_RESP_ADD_TAG", @@ -345,7 +347,11 @@ typedef struct { char driver[NEU_NODE_NAME_LEN]; char group[NEU_GROUP_NAME_LEN]; char new_name[NEU_GROUP_NAME_LEN]; - int error; + struct { + int error; + uint32_t unused; // padding for memory layout compatible with + // neu_req_update_group_t + }; } neu_resp_update_group_t; typedef struct neu_req_del_group { diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 972872a7..9565f23c 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -501,6 +501,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_RESP_GET_NODE_STATE: case NEU_RESP_GET_NODES_STATE: case NEU_RESP_GET_NODE_SETTING: + case NEU_REQ_UPDATE_GROUP: case NEU_REQ_SUBSCRIBE_GROUP: case NEU_REQ_UPDATE_SUBSCRIBE_GROUP: case NEU_REQ_UNSUBSCRIBE_GROUP: @@ -701,7 +702,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) reply(adapter, header, &error); break; } - case NEU_REQ_UPDATE_GROUP: { + case NEU_REQ_UPDATE_DRIVER_GROUP: { neu_req_update_group_t *cmd = (neu_req_update_group_t *) &header[1]; neu_resp_update_group_t resp = { 0 }; @@ -722,7 +723,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) strcpy(resp.driver, cmd->driver); strcpy(resp.group, cmd->group); strcpy(resp.new_name, cmd->new_name); - header->type = NEU_RESP_UPDATE_GROUP; + header->type = NEU_RESP_UPDATE_DRIVER_GROUP; neu_msg_exchange(header); reply(adapter, header, &resp); break; @@ -1477,10 +1478,11 @@ void *neu_msg_gen(neu_reqresp_head_t *header, void *data) data_size = sizeof(neu_req_add_group_t); break; case NEU_REQ_UPDATE_GROUP: + case NEU_REQ_UPDATE_DRIVER_GROUP: case NEU_REQ_UPDATE_GROUP_EVENT: data_size = sizeof(neu_req_update_group_t); break; - case NEU_RESP_UPDATE_GROUP: + case NEU_RESP_UPDATE_DRIVER_GROUP: data_size = sizeof(neu_resp_update_group_t); break; case NEU_REQ_DEL_GROUP: diff --git a/src/core/manager.c b/src/core/manager.c index 50eb0ee2..b361b8e0 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -868,7 +868,6 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_REQ_GET_TAG: case NEU_REQ_GET_NDRIVER_TAGS: case NEU_REQ_NODE_CTL: - case NEU_REQ_UPDATE_GROUP: case NEU_REQ_ADD_GROUP: { if (neu_node_manager_find(manager->node_manager, header->receiver) == NULL) { @@ -911,11 +910,25 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) break; } - case NEU_RESP_UPDATE_GROUP: { + case NEU_RESP_UPDATE_DRIVER_GROUP: { neu_resp_update_group_t *resp = (neu_resp_update_group_t *) &header[1]; if (0 == resp->error) { neu_manager_update_group_name(manager, resp->driver, resp->group, resp->new_name); + + UT_array *apps = neu_subscribe_manager_find( + manager->subscribe_manager, resp->driver, resp->new_name); + + if (NULL != apps) { + // notify app node about group renaming + utarray_foreach(apps, neu_app_subscribe_t *, app) + { + header->type = NEU_REQ_UPDATE_GROUP; + forward_msg(manager, msg, app->app_name); + } + + utarray_free(apps); + } } neu_resp_error_t e = { .error = resp->error }; @@ -940,6 +953,29 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) break; } + case NEU_REQ_UPDATE_GROUP: { + neu_resp_error_t e = { 0 }; + + if (neu_node_manager_find(manager->node_manager, header->receiver) == + NULL) { + e.error = NEU_ERR_NODE_NOT_EXIST; + } else if (!neu_node_manager_is_driver(manager->node_manager, + header->receiver)) { + e.error = NEU_ERR_GROUP_NOT_ALLOW; + } else { + header->type = NEU_REQ_UPDATE_DRIVER_GROUP; + forward_msg(manager, msg, header->receiver); + } + + if (e.error) { + header->type = NEU_RESP_ERROR; + neu_msg_exchange(header); + reply(manager, header, &e); + } + + break; + } + case NEU_REQ_DEL_GROUP: { neu_req_del_group_t *cmd = (neu_req_del_group_t *) &header[1];