From 082ffd4af505d063cd2842611cfe3519226d9316 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 01/28] Revert "Make sample app plugin handle NEU_REQRESP_UPDATE_LIC request" This reverts commit dd0bd8a4487822622c0c38376cf5c20ff843451d. --- plugins/sample/plugin_sample_app.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/plugins/sample/plugin_sample_app.c b/plugins/sample/plugin_sample_app.c index 76abde44..f6acd2e7 100644 --- a/plugins/sample/plugin_sample_app.c +++ b/plugins/sample/plugin_sample_app.c @@ -551,18 +551,6 @@ static int sample_app_plugin_request(neu_plugin_t *plugin, neu_request_t *req) break; } - case NEU_REQRESP_UPDATE_LIC: { - neu_reqresp_update_lic_t *lic_update = req->buf; - assert(req->buf_len == sizeof(*lic_update)); - log_info("sample app receive license update request:`%s`", - lic_update->lic_fname); - neu_plugin_send_lic_cmd(plugin, plugin_get_event_id(plugin), - NEURON_LIC_FNAME, NEURON_LIC_KEY_LICENSE_TYPE); - log_info("Send get license:`%s` key:`%s`", NEURON_LIC_FNAME, - NEURON_LIC_KEY_LICENSE_TYPE); - break; - } - default: break; } From 4b3a46e998290bc60fdda4f8a11ab9b49deeb1aa Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 02/28] Revert "Make manager_loop forward MSG_EVENT_LIC_UPDATED event" This reverts commit 5c6fdb50c78141af1e391107551c7e97101202df. --- src/core/neu_manager.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index d85ed6ce..99389ac5 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -1281,25 +1281,6 @@ static void manager_loop(void *arg) break; } - case MSG_EVENT_LIC_UPDATED: { - neu_event_lic_updated_t *lic_event = msg_get_buf_ptr(pay_msg); - - nng_mtx_lock(manager->adapters_mtx); - adapter_reg_entity_t *reg_entity = find_reg_adapter_by_id( - &manager->reg_adapters, lic_event->node_id); - nng_mtx_unlock(manager->adapters_mtx); - - nng_pipe msg_pipe = reg_entity->adapter_pipe; - rv = manager_send_msg_to_pipe(manager, msg_pipe, - MSG_EVENT_LIC_UPDATED, lic_event, - sizeof(*lic_event)); - if (0 == rv) { - log_info("Forward license update event to pipe: %d", msg_pipe); - } - - break; - } - case MSG_CMD_SUBSCRIBE_NODE: { subscribe_node_cmd_t *cmd_ptr = msg_get_buf_ptr(pay_msg); rv = neu_manager_subscribe_node(manager, cmd_ptr); From b7d1aa4f53a15fa74f63b1978d530c2a3423457d Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 03/28] Revert "Make adapter_loop handle MSG_EVENT_LIC_UPDATED event" This reverts commit ee409eea604bcaee4215907602b5ca83159dd909. --- src/adapter/adapter.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 5c67780b..a2f59465 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -925,24 +925,6 @@ static void adapter_loop(void *arg) break; } - case MSG_EVENT_LIC_UPDATED: { - neu_event_lic_updated_t *lic_event = msg_get_buf_ptr(pay_msg); - neu_reqresp_update_lic_t lic_update = {}; - lic_update.lic_fname = lic_event->lic_fname; - - const neu_plugin_intf_funs_t *intf_funs; - neu_request_t req; - - intf_funs = adapter->plugin_module->intf_funs; - req.req_id = adapter_get_req_id(adapter); - req.req_type = NEU_REQRESP_UPDATE_LIC; - req.sender_id = 0; - req.buf_len = sizeof(lic_update); - req.buf = &lic_update; - intf_funs->request(adapter->plugin, &req); - break; - } - case MSG_CMD_SUBSCRIBE_NODE: { subscribe_node_cmd_t *cmd_ptr; cmd_ptr = (subscribe_node_cmd_t *) msg_get_buf_ptr(pay_msg); From 3a0909d2a8b0c5fcbcb780f582c9922821a3fdba Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 04/28] Revert "Make adapter_event_notify handle NEU_EVENT_LIC_UPDATED event" This reverts commit 19d914e6db0eddd8d5c12cdb9a5b5a7fb42f358e. --- src/adapter/adapter.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index a2f59465..1f9547a1 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1778,12 +1778,6 @@ static int adapter_event_notify(neu_adapter_t * adapter, break; } - case NEU_EVENT_LIC_UPDATED: { - ADAPTER_SEND_BUF(adapter, rv, MSG_EVENT_LIC_UPDATED, event->buf, - event->buf_len); - break; - } - default: break; } From 5a30828af4a65e78e7d7321c6deb2408d09e9daf Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 05/28] Revert "Add function neu_plugin_notify_event_update_lic" This reverts commit 183819202392ccdd191e66e7ceaa7da5ec3c9214. --- include/neu_plugin.h | 3 --- src/base/neu_plugin_common.c | 21 --------------------- 2 files changed, 24 deletions(-) diff --git a/include/neu_plugin.h b/include/neu_plugin.h index d42a3d96..de31aed9 100644 --- a/include/neu_plugin.h +++ b/include/neu_plugin.h @@ -134,9 +134,6 @@ int neu_plugin_notify_event_del_tags(neu_plugin_t *plugin, uint32_t event_id, int neu_plugin_notify_event_update_tags(neu_plugin_t *plugin, uint32_t event_id, neu_node_id_t node_id, const char * grp_config_name); -int neu_plugin_notify_event_update_lic(neu_plugin_t *plugin, uint32_t event_id, - neu_node_id_t node_id, - const char * lic_fname); intptr_t neu_system_del_plugin(neu_plugin_t *plugin, plugin_id_t plugin_id); intptr_t neu_system_update_plugin(neu_plugin_t *plugin, plugin_kind_e kind, diff --git a/src/base/neu_plugin_common.c b/src/base/neu_plugin_common.c index 3efe65c0..9a997bcf 100644 --- a/src/base/neu_plugin_common.c +++ b/src/base/neu_plugin_common.c @@ -363,27 +363,6 @@ int neu_plugin_notify_event_update_tags(neu_plugin_t *plugin, uint32_t event_id, node_id, grp_config_name); } -int neu_plugin_notify_event_update_lic(neu_plugin_t *plugin, uint32_t event_id, - neu_node_id_t node_id, - const char * lic_fname) -{ - neu_event_lic_updated_t lic_event = { - .node_id = node_id, - .lic_fname = lic_fname, - }; - - neu_event_notify_t event = { - .event_id = event_id, - .type = NEU_EVENT_LIC_UPDATED, - .buf = &lic_event, - .buf_len = sizeof(lic_event), - }; - - neu_plugin_common_t *plugin_common = neu_plugin_to_plugin_common(plugin); - return plugin_common->adapter_callbacks->event_notify( - plugin_common->adapter, &event); -} - void neu_plugin_response_trans_data(neu_plugin_t * plugin, neu_taggrp_config_t *grp_config, neu_data_val_t *data, uint32_t event_id) From f14b2e4b07299625b10cd4dbaf17ebd51fc4c4de Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 06/28] Revert "Add new message type MSG_EVENT_LIC_UPDATED" This reverts commit 7a720c8ed31240d4f8cec2a8a39320c367375e82. --- src/core/message.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/message.h b/src/core/message.h index 9dfe1eb6..7721ea5c 100644 --- a/src/core/message.h +++ b/src/core/message.h @@ -76,7 +76,6 @@ typedef enum msg_type { MSG_EVENT_ADD_TAGS, MSG_EVENT_UPDATE_TAGS, MSG_EVENT_DEL_TAGS, - MSG_EVENT_LIC_UPDATED, MSG_TYPE_EVENT_END, MSG_TYPE_DATA_START = 0x3000, From f7448742bbfbe6d845150fc0276acf5d7b494f2d Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 07/28] Revert "Add new event structure type neu_event_lic_updated_t" This reverts commit 0af74caf774382e6cf032210820d0c0db1332306. --- include/neu_adapter.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 508872bb..cbbad792 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -404,11 +404,6 @@ typedef struct neu_event_tags { char * grp_config_name; } neu_event_tags_t; -typedef struct { - neu_node_id_t node_id; - const char * lic_fname; // don't take ownership -} neu_event_lic_updated_t; - /** * definition enum and structure for neuron config */ From 8fd7cacd7b517b9ae8234da2ccfa8da178e359fa Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 08/28] Revert "Add new event type NEU_EVENT_LIC_UPDATED" This reverts commit ace1f1791cf0169f9ae302390e3d80e5b7153046. --- include/neu_adapter.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index cbbad792..786973bd 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -382,7 +382,6 @@ typedef enum neu_event_type { NEU_EVENT_ADD_TAGS, NEU_EVENT_UPDATE_TAGS, NEU_EVENT_DEL_TAGS, - NEU_EVENT_LIC_UPDATED, } neu_event_type_e; typedef struct neu_event_notify { From 3f1ed1e669312dd2a1a032e331ba10ce92f7a393 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 09/28] Revert "Add new request structure type neu_reqresp_update_lic_t" This reverts commit 2823676f30da8631e16f2102b70ea483f91e0f8e. --- include/neu_adapter.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 786973bd..78572374 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -333,11 +333,6 @@ typedef struct { neu_data_val_t *val; } neu_reqresp_lic_val_t; -/* NEU_REQRESP_UPDATE_LIC */ -typedef struct { - const char *lic_fname; // don't take ownership -} neu_reqresp_update_lic_t; - typedef enum neu_adapter_ctl { NEU_ADAPTER_CTL_START = 0, NEU_ADAPTER_CTL_STOP, From 8e3b4f6420188a572735cc8b950b10d757b9f2a6 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:38:23 +0800 Subject: [PATCH 10/28] Revert "Add new request type NEU_REQRESP_UPDATE_LIC" This reverts commit fced237422ac2aa4f86f8eb7b20aad623d636c54. --- include/neu_adapter.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 78572374..50c0c993 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -85,7 +85,6 @@ typedef enum neu_reqresp_type { NEU_REQRESP_VALIDATE_TAG, NEU_REQRESP_GET_LIC_VAL, NEU_REQRESP_LIC_VAL, - NEU_REQRESP_UPDATE_LIC, } neu_reqresp_type_e; typedef uint32_t neu_node_id_t; From c59f09028ea8e0fbeec81abd4f66267af42785b4 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:39:24 +0800 Subject: [PATCH 11/28] Revert "Make sample app plugin send license get value command" This reverts commit a89fae19dbfcb967c0f713ae1a95e18695ae8e41. --- plugins/sample/plugin_sample_app.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/plugins/sample/plugin_sample_app.c b/plugins/sample/plugin_sample_app.c index f6acd2e7..3b9efcf9 100644 --- a/plugins/sample/plugin_sample_app.c +++ b/plugins/sample/plugin_sample_app.c @@ -24,7 +24,6 @@ #include #include -#include "neu_license.h" #include "neuron.h" const neu_plugin_module_t neu_plugin_module; @@ -317,14 +316,6 @@ get_grp_configs_retry: usleep(500000); log_info("Restart a node(%d)", dst_node_id); neu_plugin_node_ctl(plugin, dst_node_id, NEU_ADAPTER_CTL_START); - - /* example of get license key value */ - neu_plugin_send_lic_cmd(plugin, plugin_get_event_id(plugin), - NEURON_LIC_FNAME, NEURON_LIC_KEY_LICENSE_TYPE); - log_info("Send get license:`%s` key:`%s`", NEURON_LIC_FNAME, - NEURON_LIC_KEY_LICENSE_TYPE); - usleep(500000); - return NULL; } @@ -539,18 +530,6 @@ static int sample_app_plugin_request(neu_plugin_t *plugin, neu_request_t *req) break; } - case NEU_REQRESP_LIC_VAL: { - char * val = NULL; - neu_reqresp_lic_val_t *lic_val = req->buf; - assert(req->buf_len == sizeof(neu_reqresp_lic_val_t)); - if (NULL != lic_val->val) { - neu_dvalue_get_ref_cstr(lic_val->val, &val); - } - log_info("sample app receive license:`%s` key:`%s`, val:`%s`", - lic_val->lic_fname, lic_val->key_name, val); - break; - } - default: break; } From 45cd6be24630db515bdf65db3ec65b7c10d17b03 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:39:24 +0800 Subject: [PATCH 12/28] Revert "Make neu_manager to forward MSG_DATA_LIC_RESP messages" This reverts commit 6593e907334ea16c61599aa739ddb2fb883e007a. --- src/core/neu_manager.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index 99389ac5..e3668ef2 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -1381,24 +1381,6 @@ static void manager_loop(void *arg) break; } - case MSG_DATA_LIC_RESP: { - lic_val_resp_t *lic_resp = msg_get_buf_ptr(pay_msg); - - nng_mtx_lock(manager->adapters_mtx); - adapter_reg_entity_t *reg_entity = find_reg_adapter_by_id( - &manager->reg_adapters, lic_resp->recver_id); - nng_mtx_unlock(manager->adapters_mtx); - - nng_pipe msg_pipe = reg_entity->adapter_pipe; - rv = manager_send_msg_to_pipe(manager, msg_pipe, MSG_DATA_LIC_RESP, - lic_resp, sizeof(*lic_resp)); - if (0 == rv) { - log_info("Forward license val resp to pipe: %d", msg_pipe); - } - - break; - } - default: log_warn("Receive a not supported message(type: %d)", msg_get_type(pay_msg)); From a5b12f58f4078e4a2fefbdc272de571aaf8ed881 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:39:24 +0800 Subject: [PATCH 13/28] Revert "Make neu_manager forward MSG_CMD_GET_LIC_VAL messages to license adapter" This reverts commit 1e13a4b3359bd4ce14e4724fc1babc114440f4af. --- src/core/neu_manager.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index e3668ef2..2a34d7a2 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -1364,23 +1364,6 @@ static void manager_loop(void *arg) break; } - case MSG_CMD_GET_LIC_VAL: { - if (NULL == license_reg_entity) { - log_warn("Drop license command due to no license adapter"); - break; - } - nng_pipe lic_pipe = license_reg_entity->adapter_pipe; - msg_type_e msg_type = msg_get_type(pay_msg); - void * buf = msg_get_buf_ptr(pay_msg); - size_t size = msg_get_buf_len(pay_msg); - rv = manager_send_msg_to_pipe(manager, lic_pipe, msg_type, buf, - size); - if (0 == rv) { - log_info("Forward license command to pipe: %d", lic_pipe); - } - break; - } - default: log_warn("Receive a not supported message(type: %d)", msg_get_type(pay_msg)); From 171252e6428e8ee13c9d4dfd1504434309702033 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:39:24 +0800 Subject: [PATCH 14/28] Revert "Make neu_manager to add license adapter if license plugin found" This reverts commit b00ab299b0d2ed791bc4445db29cad5d8cb8551b. --- src/core/neu_manager.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index 2a34d7a2..66d61885 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -95,7 +95,6 @@ static const char *const manager_url = "inproc://neu_manager"; #define WEBSERVER_PLUGIN_LIB_NAME "libplugin-webserver-proxy.so" #define MQTT_PLUGIN_LIB_NAME "libplugin-mqtt.so" #define MODBUS_TCP_PLUGIN_LIB_NAME "libplugin-modbus-tcp.so" -#define LICENSE_PLUGIN_LIB_NAME "libplugin-license.so" #endif @@ -107,7 +106,6 @@ static const char *const manager_url = "inproc://neu_manager"; // definition for adapter names #define DEFAULT_DASHBOARD_ADAPTER_NAME "default-dashboard-adapter" #define DEFAULT_PERSIST_ADAPTER_NAME "default-persist-adapter" -#define DEFAULT_LICENSE_ADAPTER_NAME "default-license-adapter" #define WEBSERVER_ADAPTER_NAME "webserver-adapter" #define ADAPTER_NAME_MAX_LEN 90 @@ -1022,8 +1020,6 @@ static void manager_loop(void *arg) nng_mtx_lock(manager->adapters_mtx); adapter_reg_entity_t *persist_reg_entity = find_reg_adapter_by_name( &manager->reg_adapters, DEFAULT_PERSIST_ADAPTER_NAME); - adapter_reg_entity_t *license_reg_entity = find_reg_adapter_by_name( - &manager->reg_adapters, DEFAULT_LICENSE_ADAPTER_NAME); nng_mtx_unlock(manager->adapters_mtx); nng_pipe persist_pipe = persist_reg_entity->adapter_pipe; From d50abba37833c2dc09c1612684c6dd6c0afdb5d1 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:40:33 +0800 Subject: [PATCH 15/28] Revert "Fix function adapter_type_from_node_type" This reverts commit 630b40e98ae0c4a42981527626685649d7cfa3bc. --- src/core/neu_manager.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index 66d61885..4808241e 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -1505,10 +1505,6 @@ static adapter_type_e adapter_type_from_node_type(neu_node_type_e node_type) adapter_type = ADAPTER_TYPE_APP; break; - case NEU_NODE_TYPE_LICENSE: - adapter_type = ADAPTER_TYPE_LICENSE; - break; - case NEU_NODE_TYPE_FUNCTIONAL: adapter_type = ADAPTER_TYPE_FUNCTIONAL; break; From c5303117e52d1633be9de1c71c898b03b8e2c779 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:02 +0800 Subject: [PATCH 16/28] Revert "Add adapter type ADAPTER_TYPE_LICENSE" This reverts commit 24fb585cf96cfdac428a36f8e2893aa857639185. --- src/adapter/adapter_info.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/adapter/adapter_info.h b/src/adapter/adapter_info.h index c6578ca6..7d20d2f5 100644 --- a/src/adapter/adapter_info.h +++ b/src/adapter/adapter_info.h @@ -31,7 +31,6 @@ typedef enum adapter_type { ADAPTER_TYPE_MQTT, ADAPTER_TYPE_STREAM_PROCESSOR, ADAPTER_TYPE_APP, - ADAPTER_TYPE_LICENSE, ADAPTER_TYPE_FUNCTIONAL, ADAPTER_TYPE_MAX, } adapter_type_e; From c5aaca69784f5f4b946960653a647c166c5e51c0 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:04 +0800 Subject: [PATCH 17/28] Revert "Expose header file neu_license.h in neuron.h" This reverts commit 251698efba8e7267c7282d26f308a059d248043e. --- include/neuron.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/neuron.h b/include/neuron.h index f9f196f8..d0e5d9c6 100644 --- a/include/neuron.h +++ b/include/neuron.h @@ -27,7 +27,6 @@ extern "C" { #include "neu_adapter.h" #include "neu_base64.h" #include "neu_file.h" -#include "neu_license.h" #include "neu_list.h" #include "neu_log.h" #include "neu_panic.h" From 2d5a90d5232bd8809f41dcbf5071ecb69a7f69e6 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:07 +0800 Subject: [PATCH 18/28] Revert "Add header file neu_license.h for license handling" This reverts commit d1950eb7cbc7f839a18cb3e6453edcc996baad2f. --- include/neu_license.h | 62 ------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 include/neu_license.h diff --git a/include/neu_license.h b/include/neu_license.h deleted file mode 100644 index 031e8e06..00000000 --- a/include/neu_license.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * NEURON IIoT System for Industry 4.0 - * Copyright (C) 2020-2022 EMQ Technologies Co., Ltd All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - **/ - -#ifndef __NEU_LICENSE_H__ -#define __NEU_LICENSE_H__ - -#define NEURON_LIC_DIR "cert" -#define NEURON_LIC_FNAME "neuron.lic" - -// License type -// Type: string -#define NEURON_LIC_KEY_LICENSE_TYPE "1.3.6.1.4.1.52509.10" - -// Max number of plugins. -// Type: integer, non-negative -#define NEURON_LIC_KEY_PLUGINS_NUM_MAX "1.3.6.1.4.1.52509.11" - -// Max number of nodes. -// Type: integer, non-negative -#define NEURON_LIC_KEY_NODES_NUM_MAX "1.3.6.1.4.1.52509.12" - -// Max number of tags globally. -// Type: integer, non-negative -#define NEURON_LIC_KEY_TAGS_NUM_MAX "1.3.6.1.4.1.52509.13" - -// If modbus_plus_tcp plugin enabled. -// Type: integer, 0 | 1 -#define NEURON_LIC_KEY_MODBUS_PLUS_TCP_ENABLED "1.3.6.1.4.1.52509.14" - -// If modbus_rtu plugin enabled -// Type: integer, 0 | 1 -#define NEURON_LIC_KEY_MODBUS_RTU_ENABLED "1.3.6.1.4.1.52509.15" - -// If opcua plugin enabled -// Type: integer, 0 | 1 -#define NEURON_LIC_KEY_OPCUA_ENABLED "1.3.6.1.4.1.52509.16" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif // __NEU_LICENSE_H__ From 7f930cf823ac8fe01965bcaf14b5f01562e8b2a9 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:08 +0800 Subject: [PATCH 19/28] Revert "Make adapter loop handle message type MSG_DATA_LIC_RESP" This reverts commit 28ff8f37fc7d4adcc077283079ef6f570b86b8f0. --- src/adapter/adapter.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 1f9547a1..1b626433 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1113,28 +1113,6 @@ static void adapter_loop(void *arg) break; } - case MSG_DATA_LIC_RESP: { - lic_val_resp_t *lic_resp = msg_get_buf_ptr(pay_msg); - - const neu_plugin_intf_funs_t *intf_funs; - neu_request_t req; - neu_reqresp_lic_val_t lic_val; - - lic_val.lic_fname = lic_resp->lic_fname; - lic_val.key_name = lic_resp->key_name; - lic_val.val = lic_resp->val; // don't take ownership - - intf_funs = adapter->plugin_module->intf_funs; - req.req_id = lic_resp->req_id; - req.req_type = NEU_REQRESP_LIC_VAL; - req.sender_id = 0; - req.buf_len = sizeof(lic_val); - req.buf = (void *) &lic_val; - intf_funs->request(adapter->plugin, &req); - neu_dvalue_free(lic_val.val); - break; - } - case MSG_CMD_EXIT_LOOP: { uint32_t exit_code; From 2975743a0cacf50d01ca75f1e550348545ba54dc Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:09 +0800 Subject: [PATCH 20/28] Revert "Make adapter_response handle response type NEU_REQRESP_LIC_VAL" This reverts commit d82cd5ce2abcff2745d42217b5a23ea9908c1438. --- src/adapter/adapter.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 1b626433..2b177e8b 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1692,34 +1692,6 @@ static int adapter_response(neu_adapter_t *adapter, neu_response_t *resp) break; } - case NEU_REQRESP_LIC_VAL: { - neu_reqresp_lic_val_t *lic_val = resp->buf; - assert(resp->buf_len == sizeof(*lic_val)); - - lic_val_resp_t lic_resp; - lic_resp.recver_id = resp->recver_id; - lic_resp.req_id = resp->req_id; - lic_resp.lic_fname = lic_val->lic_fname; - lic_resp.key_name = lic_val->key_name; - lic_resp.val = lic_val->val; // ownership transferred - - nng_msg *msg = nng_msg_inplace_from_buf(MSG_DATA_LIC_RESP, &lic_resp, - sizeof(lic_resp)); - if (NULL == msg) { - log_error("unable to allocate NEU_REQRESP_LIC_VAL message."); - neu_dvalue_free(lic_resp.val); - break; - } - - rv = nng_sendmsg(adapter->sock, msg, 0); - if (0 != rv) { - neu_dvalue_free(lic_resp.val); - nng_msg_free(msg); - log_error("fail to send NEU_REQRESP_LIC_VAL message."); - } - break; - } - default: break; } From bca3d3817e29ed5c118ff8726be3b831920c8115 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:10 +0800 Subject: [PATCH 21/28] Revert "Make adapter loop handle message type MSG_CMD_GET_LIC_VAL" This reverts commit 3971f4209b846972a6917dbfd3c7e6222d56163b. --- src/adapter/adapter.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 2b177e8b..d949d4c6 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1093,26 +1093,6 @@ static void adapter_loop(void *arg) break; } - case MSG_CMD_GET_LIC_VAL: { - get_lic_val_cmd_t *cmd_ptr = msg_get_buf_ptr(pay_msg); - - const neu_plugin_intf_funs_t *intf_funs; - neu_request_t req; - neu_reqresp_get_lic_val_t lic_req; - - lic_req.lic_fname = cmd_ptr->lic_fname; - lic_req.key_name = cmd_ptr->key_name; - - intf_funs = adapter->plugin_module->intf_funs; - req.req_id = cmd_ptr->req_id; - req.req_type = NEU_REQRESP_GET_LIC_VAL; - req.sender_id = cmd_ptr->sender_id; - req.buf_len = sizeof(lic_req); - req.buf = (void *) &lic_req; - intf_funs->request(adapter->plugin, &req); - break; - } - case MSG_CMD_EXIT_LOOP: { uint32_t exit_code; From d81fc9d1e74e32814491002acc88e60d8ec9fc79 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:12 +0800 Subject: [PATCH 22/28] Revert "Make adapter command handle request type NEU_REQRESP_GET_LIC_VAL" This reverts commit ead21e28e44453358371d8fbf269148d390d120c. --- src/adapter/adapter.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index d949d4c6..6e49085d 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1538,19 +1538,6 @@ static int adapter_command(neu_adapter_t *adapter, neu_request_t *cmd, break; } - case NEU_REQRESP_GET_LIC_VAL: { - neu_reqresp_get_lic_val_t *lic_req = cmd->buf; - get_lic_val_cmd_t lic_cmd = {}; - lic_cmd.sender_id = to_node_id(adapter, adapter->id); - lic_cmd.req_id = cmd->req_id; - lic_cmd.lic_fname = lic_req->lic_fname; - lic_cmd.key_name = lic_req->key_name; - - ADAPTER_SEND_BUF(adapter, rv, MSG_CMD_GET_LIC_VAL, &lic_cmd, - sizeof(lic_cmd)); - break; - } - default: rv = -1; break; From d334b512c35c7d3d00842bb72862dc70dafe2ede Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:13 +0800 Subject: [PATCH 23/28] Revert "Add function neu_plugin_send_lic_cmd" This reverts commit 4aff210d0ecfb62e3cb81540b224027ab69bf491. --- include/neu_plugin.h | 2 -- src/base/neu_plugin_common.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/include/neu_plugin.h b/include/neu_plugin.h index de31aed9..18e00ae6 100644 --- a/include/neu_plugin.h +++ b/include/neu_plugin.h @@ -114,8 +114,6 @@ void neu_plugin_send_write_cmd(neu_plugin_t *plugin, uint32_t event_id, neu_node_id_t node_id, neu_taggrp_config_t *grp_configs, neu_data_val_t * data); -void neu_plugin_send_lic_cmd(neu_plugin_t *plugin, uint32_t event_id, - const char *license_fname, const char *key); void neu_plugin_response_trans_data(neu_plugin_t * plugin, neu_taggrp_config_t *grp_config, neu_data_val_t *data, uint32_t event_id); diff --git a/src/base/neu_plugin_common.c b/src/base/neu_plugin_common.c index 9a997bcf..81f9603c 100644 --- a/src/base/neu_plugin_common.c +++ b/src/base/neu_plugin_common.c @@ -301,18 +301,6 @@ void neu_plugin_send_write_cmd(neu_plugin_t *plugin, uint32_t event_id, PLUGIN_SEND_CMD(plugin, NEU_REQRESP_WRITE_DATA, write_req, event_id) } -void neu_plugin_send_lic_cmd(neu_plugin_t *plugin, uint32_t event_id, - const char *license_fname, const char *key) -{ - - neu_reqresp_get_lic_val_t lic_req = { - .lic_fname = license_fname, - .key_name = key, - }; - - PLUGIN_SEND_CMD(plugin, NEU_REQRESP_GET_LIC_VAL, lic_req, event_id) -} - static inline int plugin_notify_tags_event(neu_plugin_t * plugin, uint32_t event_id, neu_event_type_e type, From 640fc243132fa75ffcd9b872b7b635fee3495f4c Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:14 +0800 Subject: [PATCH 24/28] Revert "Add new cmd/data structure type license key value passing" This reverts commit d5ff324d20bed01e59613fffe332d8de2441d1c5. --- src/core/message.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/core/message.h b/src/core/message.h index 7721ea5c..053c8f74 100644 --- a/src/core/message.h +++ b/src/core/message.h @@ -155,14 +155,6 @@ typedef struct grp_config_changed_cmd { neu_node_id_t dst_node_id; } grp_config_changed_cmd_t; -/* MSG_CMD_GET_LIC_VAL */ -typedef struct { - adapter_id_t sender_id; - uint32_t req_id; - const char * lic_fname; // don't take ownership - const char * key_name; // don't take ownership -} get_lic_val_cmd_t; - /* MSG_EVENT_GROUP_CONFIG_CHANGED */ typedef struct grp_config_changed_event { neu_taggrp_config_t *grp_config; @@ -194,15 +186,6 @@ typedef struct write_data_resp { uint32_t req_id; } write_data_resp_t; -/* MSG_DATA_LIC_RESP */ -typedef struct { - adapter_id_t recver_id; - uint32_t req_id; - const char * lic_fname; // don't take ownership - const char * key_name; // don't take ownership - neu_data_val_t *val; -} lic_val_resp_t; - typedef struct message message_t; // get size of message From 138fa57a46955eb8b70faf1db89ccfb52602c286 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:15 +0800 Subject: [PATCH 25/28] Revert "Add new message type for license key value passing" This reverts commit 69e6f3ddfc4a63212dca13a6b8d245ade0e89c61. --- src/core/message.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/message.h b/src/core/message.h index 053c8f74..907e98de 100644 --- a/src/core/message.h +++ b/src/core/message.h @@ -39,7 +39,6 @@ typedef enum msg_type { MSG_CMD_SUBSCRIBE_NODE, MSG_CMD_UNSUBSCRIBE_NODE, MSG_CMD_GROUP_CONFIG_CHANGED, - MSG_CMD_GET_LIC_VAL, MSG_CMD_PERSISTENCE_LOAD, MSG_CMD_EXIT_LOOP, MSG_CMD_RESP_PONG, // response pong for ping @@ -82,7 +81,6 @@ typedef enum msg_type { MSG_DATA_NEURON_TRANS_DATA = MSG_TYPE_DATA_START, MSG_DATA_READ_RESP, MSG_DATA_WRITE_RESP, - MSG_DATA_LIC_RESP, MSG_TYPE_DATA_END, // User customer message types From 7826a5054762109e70749d18022639b5f8fe13c1 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:16 +0800 Subject: [PATCH 26/28] Revert "Add request/response structure for license key value passing" This reverts commit 2c89eecf4872ea0e4f99c22ba9b80af987eb26e8. --- include/neu_adapter.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 50c0c993..9b81aa30 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -319,19 +319,6 @@ typedef struct neu_reqresp_sub_grp_configs { vector_t *sub_grp_configs; } neu_reqresp_sub_grp_configs_t; -/* NEU_REQRESP_GET_LIC_VAL */ -typedef struct { - const char *lic_fname; // don't take ownership - const char *key_name; // don't take ownership -} neu_reqresp_get_lic_val_t; - -/* NEU_REQRESP_LIC_VAL */ -typedef struct { - const char * lic_fname; // don't take ownership - const char * key_name; // don't take ownership - neu_data_val_t *val; -} neu_reqresp_lic_val_t; - typedef enum neu_adapter_ctl { NEU_ADAPTER_CTL_START = 0, NEU_ADAPTER_CTL_STOP, From 310d222badb7cc5469a764a3e58daf4ae46aedfc Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:17 +0800 Subject: [PATCH 27/28] Revert "Add new request type for license key value passing" This reverts commit df29fb6758f89b58bc6ec565a7bfdcd6b95d75cd. --- include/neu_adapter.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 9b81aa30..66d437a1 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -83,8 +83,6 @@ typedef enum neu_reqresp_type { NEU_REQRESP_GET_SUB_GRP_CONFIGS, NEU_REQRESP_SUB_GRP_CONFIGS_RESP, NEU_REQRESP_VALIDATE_TAG, - NEU_REQRESP_GET_LIC_VAL, - NEU_REQRESP_LIC_VAL, } neu_reqresp_type_e; typedef uint32_t neu_node_id_t; From b3c92d237f95de92ecabddd34c0b13545ca5f954 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:41:50 +0800 Subject: [PATCH 28/28] Revert "Add node type NEU_NODE_TYPE_LICENSE" This reverts commit 3539b634502c60d52934737dfe600059d56b3e35. --- include/neu_adapter.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/neu_adapter.h b/include/neu_adapter.h index 66d437a1..1eed5e4d 100644 --- a/include/neu_adapter.h +++ b/include/neu_adapter.h @@ -139,7 +139,6 @@ typedef enum neu_node_type { NEU_NODE_TYPE_MQTT, NEU_NODE_TYPE_STREAM_PROCESSOR, NEU_NODE_TYPE_APP, - NEU_NODE_TYPE_LICENSE, NEU_NODE_TYPE_FUNCTIONAL, NEU_NODE_TYPE_MAX, } neu_node_type_e;