Merge pull request #1063 from fengzeroz/v2.2

version: 2.2.14

.github/workflows/test-helm.yaml

@@ -17,7 +17,7 @@ jobs:
         run: |
           helm install neuron deploy/charts/neuron\
             --set image.repository="emqx/neuron"\
-            --set image.tag="2.0.1"
+            --set image.tag="2.2.14"
       - name: Check deployment
         timeout-minutes: 5
         run: |

include/neuron/define.h

@@ -20,12 +20,12 @@
 #ifndef _NEU_DEFINE_H_
 #define _NEU_DEFINE_H_
 
-#define NEU_TAG_NAME_LEN 48
+#define NEU_TAG_NAME_LEN 64
 #define NEU_TAG_ADDRESS_LEN 128
 #define NEU_TAG_DESCRIPTION_LEN 128
-#define NEU_GROUP_NAME_LEN 32
+#define NEU_GROUP_NAME_LEN 128
 #define NEU_GROUP_INTERVAL_LIMIT 100
-#define NEU_NODE_NAME_LEN 32
+#define NEU_NODE_NAME_LEN 128
 #define NEU_PLUGIN_NAME_LEN 32
 #define NEU_PLUGIN_LIBRARY_LEN 32
 #define NEU_PLUGIN_DESCRIPTION_LEN 512

persistence/0001_2.2.1.sql

@@ -0,0 +1,64 @@
+
+BEGIN TRANSACTION;
+
+ALTER TABLE nodes RENAME TO old_nodes;
+CREATE TABLE
+  nodes (
+    name TEXT PRIMARY KEY check(length(name) <= 128),
+    type integer(1) NOT NULL check(type IN (1, 2)),
+    state integer(1) NOT NULL check(state BETWEEN 1 AND 4),
+    plugin_name TEXT NOT NULL check(length(plugin_name) <= 32)
+  );
+INSERT INTO nodes SELECT * FROM old_nodes;
+
+ALTER TABLE groups RENAME TO old_groups;
+CREATE TABLE IF NOT EXISTS
+  groups (
+    driver_name TEXT NOT NULL,
+    name TEXT NULL check(length(name) <= 128),
+    interval INTEGER NOT NULL check(interval >= 100),
+    UNIQUE (driver_name, name),
+    FOREIGN KEY (driver_name) REFERENCES nodes (name) ON UPDATE CASCADE ON DELETE CASCADE
+  );
+INSERT INTO groups SELECT * FROM old_groups;
+
+ALTER TABLE tags RENAME TO old_tags;
+CREATE TABLE IF NOT EXISTS
+  tags (
+    driver_name TEXT NOT NULL,
+    group_name TEXT NOT NULL,
+    name TEXT NULL check(length(name) <= 64),
+    address TEXT NULL check(length(address) <= 128),
+    attribute INTEGER NOT NULL check(attribute BETWEEN 0 AND 7),
+    precision INTEGER NOT NULL check(precision BETWEEN 0 AND 17),
+    decimal REAL NOT NULL,
+    type INTEGER NOT NULL check(type BETWEEN 0 AND 19),
+    description TEXT NULL check(length(description) <= 128),
+    UNIQUE (driver_name, group_name, name),
+    FOREIGN KEY (driver_name, group_name) REFERENCES groups (driver_name, name) ON UPDATE CASCADE ON DELETE CASCADE
+  );
+INSERT INTO tags SELECT * FROM old_tags;
+
+ALTER TABLE subscriptions RENAME TO old_subscriptions;
+CREATE TABLE IF NOT EXISTS
+  subscriptions (
+    app_name TEXT NOT NULL,
+    driver_name TEXT NOT NULL,
+    group_name TEXT NOT NULL,
+    CHECK (app_name != driver_name),
+    UNIQUE (app_name, driver_name, group_name),
+    FOREIGN KEY (app_name) REFERENCES nodes (name) ON UPDATE CASCADE ON DELETE CASCADE,
+    FOREIGN KEY (driver_name, group_name) REFERENCES groups (driver_name, name) ON UPDATE CASCADE ON DELETE CASCADE
+  );
+INSERT INTO subscriptions SELECT * FROM old_subscriptions;
+
+ALTER TABLE settings RENAME TO old_settings;
+CREATE TABLE IF NOT EXISTS
+  settings (
+    node_name TEXT NOT NULL,
+    setting TEXT NOT NULL,
+    UNIQUE (node_name),
+    FOREIGN KEY (node_name) REFERENCES nodes (name) ON UPDATE CASCADE ON DELETE CASCADE
+  );
+INSERT INTO settings SELECT * FROM old_settings;
+COMMIT;

plugins/restful/license.c

@@ -109,31 +109,35 @@ static uint64_t get_asn1_ts(ASN1_TIME *time, char **ts_str)
 
 static int scan_bitvec(uint8_t vec[], size_t size, const char *hex)
 {
-    if ('0' == *hex && 'x' == tolower(*(hex + 1))) {
-        hex += 2;
+    // 0xFFFFFFFFFFFFF
+    // skip 0x
+    char *tmp   = strdup(hex);
+    char *start = tmp;
+    int   index = 0;
+
+    tmp += 2;
+    if (strlen(tmp) % 2 == 1) {
+        tmp -= 1;
+        tmp[0] = '0';
     }
 
-    size_t i   = 0;
-    size_t len = strlen(hex);
-
-    while (i < len && i / 2 < size) {
-        char    c = hex[len - 1 - i];
+    for (int i = strlen(tmp) - 2; i >= 0; i -= 2) {
         uint8_t v = 0;
-        if ('0' <= c && c <= '9') {
-            v = c - '0';
-        } else if ('a' <= c && c <= 'f') {
-            v = 10 + c - 'a';
-        } else if ('A' <= c && c <= 'F') {
-            v = 10 + c - 'A';
-        } else {
-            break;
-        }
 
-        vec[i / 2] += v << ((i & 0x01) * 4);
-        ++i;
+        if (sscanf(tmp + i, "%02hhX", &v) != 1) {
+            free(start);
+            return -1;
+        }
+        if ((size_t) index > size) {
+            free(start);
+            return -1;
+        }
+        vec[index] = v;
+        index += 1;
     }
 
-    return (i == len) ? 0 : -1;
+    free(start);
+    return 0;
 }
 
 void print_bitvec(char *s, size_t size, uint8_t vec[], size_t n)

src/connection/connection.c

@@ -235,6 +235,11 @@ ssize_t neu_conn_tcp_server_send(neu_conn_t *conn, int fd, uint8_t *buf,
     conn_tcp_server_listen(conn);
     ret = send(fd, buf, len, MSG_NOSIGNAL | MSG_DONTWAIT);
 
+    if (ret <= 0 && errno != EAGAIN) {
+        conn->disconnected(conn->data, fd);
+        conn_tcp_server_del_client(conn, fd);
+    }
+
     pthread_mutex_unlock(&conn->mtx);
 
     return ret;
@@ -257,6 +262,11 @@ ssize_t neu_conn_tcp_server_recv(neu_conn_t *conn, int fd, uint8_t *buf,
         ret = recv(fd, buf, len, 0);
     }
 
+    if (ret <= 0) {
+        conn->disconnected(conn->data, fd);
+        conn_tcp_server_del_client(conn, fd);
+    }
+
     pthread_mutex_unlock(&conn->mtx);
 
     return ret;
@@ -509,6 +519,7 @@ static void conn_tcp_server_stop(neu_conn_t *conn)
             conn->fd = 0;
         }
 
+        conn->tcp_server.n_client  = 0;
         conn->tcp_server.is_listen = false;
     }
 }
@@ -758,6 +769,7 @@ static void conn_disconnect(neu_conn_t *conn)
                 conn->tcp_server.clients[i].fd = 0;
             }
         }
+        conn->tcp_server.n_client = 0;
         break;
     case NEU_CONN_TCP_CLIENT:
     case NEU_CONN_UDP:
@@ -804,8 +816,6 @@ static void conn_tcp_server_del_client(neu_conn_t *conn, int fd)
             return;
         }
     }
-
-    assert(1 == 0);
 }
 
 void neu_conn_stream_consume(neu_conn_t *conn, void *context,

version

@@ -1 +1 @@
-2.2.9
+2.2.14