From fefda5a3425c43f3c49c4192772faf2ed03f1a9c Mon Sep 17 00:00:00 2001
From: fengzero <fengzero@fengzero.com>
Date: Fri, 16 Jun 2023 07:02:41 +0000
Subject: [PATCH 1/2] chore(ci): ui version 2.5.0

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a882c55..2e64dba1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   VERSION: 2.6.0
-  UI_VERSION: 2.4.6
+  UI_VERSION: 2.5.0
   BRANCH: main
 
 jobs:

From 99f294f244fe2d31c01bdaeaf6a00d848b666d15 Mon Sep 17 00:00:00 2001
From: fengzero <fengzero@fengzero.com>
Date: Fri, 16 Jun 2023 10:54:53 +0000
Subject: [PATCH 2/2] Revert "fix(ekuiper): check ip address listenable"

This reverts commit 27730a16f35aa1888f8d3b71e461e92f4fdc6f3d.
---
 ft/resource/error.resource       |  1 -
 include/neuron/errcodes.h        |  1 -
 plugins/ekuiper/plugin_ekuiper.c | 35 +-------------------------------
 src/utils/http.c                 |  1 -
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/ft/resource/error.resource b/ft/resource/error.resource
index 9058cb0f..2d75e1ab 100644
--- a/ft/resource/error.resource
+++ b/ft/resource/error.resource
@@ -16,7 +16,6 @@ ${NEU_ERR_FILE_NOT_EXIST}                       1011
 ${NEU_ERR_INVALID_PASSWORD_LEN}                 1012
 ${NEU_ERR_DUPLICATE_PASSWORD}                   1013
 ${NEU_ERR_COMMAND_EXECUTION_FAILED}             1014
-${NEU_ERR_INVALID_IP_ADDRESS}                   1015
 
 ${NEU_ERR_NODE_EXIST}                           2002
 ${NEU_ERR_NODE_NOT_EXIST}                       2003
diff --git a/include/neuron/errcodes.h b/include/neuron/errcodes.h
index 8f500eea..ed4ecc3a 100644
--- a/include/neuron/errcodes.h
+++ b/include/neuron/errcodes.h
@@ -45,7 +45,6 @@ typedef enum {
     NEU_ERR_INVALID_PASSWORD_LEN     = 1012,
     NEU_ERR_DUPLICATE_PASSWORD       = 1013,
     NEU_ERR_COMMAND_EXECUTION_FAILED = 1014,
-    NEU_ERR_INVALID_IP_ADDRESS       = 1015,
 
     NEU_ERR_NODE_EXIST               = 2002,
     NEU_ERR_NODE_NOT_EXIST           = 2003,
diff --git a/plugins/ekuiper/plugin_ekuiper.c b/plugins/ekuiper/plugin_ekuiper.c
index c4edaeb1..9325651c 100644
--- a/plugins/ekuiper/plugin_ekuiper.c
+++ b/plugins/ekuiper/plugin_ekuiper.c
@@ -17,10 +17,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  **/
 
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
 #include "errcodes.h"
 #include "neuron.h"
 #include "utils/asprintf.h"
@@ -131,8 +127,7 @@ static int ekuiper_plugin_start(neu_plugin_t *plugin)
     if ((rv = nng_listen(plugin->sock, url, NULL, 0)) != 0) {
         plog_error(plugin, "nng_listen: %s", nng_strerror(rv));
         nng_close(plugin->sock);
-        rv = (NNG_EADDRINVAL == rv) ? NEU_ERR_INVALID_IP_ADDRESS
-                                    : NEU_ERR_EINTERNAL;
+        return NEU_ERR_EINTERNAL;
     }
 
     nng_recv_aio(plugin->sock, plugin->recv_aio);
@@ -168,12 +163,6 @@ static int parse_config(neu_plugin_t *plugin, const char *setting,
         goto error;
     }
 
-    struct in_addr addr;
-    if (0 == inet_aton(host.v.val_str, &addr)) {
-        plog_error(plugin, "inet_aton fail: %s", host.v.val_str);
-        goto error;
-    }
-
     // port, required
     if (0 == port.v.val_int || port.v.val_int > 65535) {
         plog_error(plugin, "setting invalid port: %" PRIi64, port.v.val_int);
@@ -193,24 +182,6 @@ error:
     return -1;
 }
 
-static inline int check_url_listenable(neu_plugin_t *plugin, const char *url)
-{
-    int rv = nng_pair0_open(&plugin->sock);
-    if (0 != rv) {
-        plog_error(plugin, "nng_pair0_open: %s", nng_strerror(rv));
-        return NEU_ERR_EINTERNAL;
-    }
-
-    if (0 != (rv = nng_listen(plugin->sock, url, NULL, 0))) {
-        plog_error(plugin, "nng_listen: %s", nng_strerror(rv));
-        rv = (NNG_EADDRINVAL == rv) ? NEU_ERR_INVALID_IP_ADDRESS
-                                    : NEU_ERR_EINTERNAL;
-    }
-
-    nng_close(plugin->sock);
-    return rv;
-}
-
 static int ekuiper_plugin_config(neu_plugin_t *plugin, const char *setting)
 {
     int      rv   = 0;
@@ -230,10 +201,6 @@ static int ekuiper_plugin_config(neu_plugin_t *plugin, const char *setting)
         goto error;
     }
 
-    if (0 != (rv = check_url_listenable(plugin, url))) {
-        goto error;
-    }
-
     plog_notice(plugin, "config success");
 
     free(plugin->host);
diff --git a/src/utils/http.c b/src/utils/http.c
index e76f7c44..bc505409 100644
--- a/src/utils/http.c
+++ b/src/utils/http.c
@@ -321,7 +321,6 @@ int neu_http_response(nng_aio *aio, neu_err_code_e code, char *content)
         break;
     case NEU_ERR_BODY_IS_WRONG:
     case NEU_ERR_PARAM_IS_WRONG:
-    case NEU_ERR_INVALID_IP_ADDRESS:
     case NEU_ERR_NODE_SETTING_INVALID:
     case NEU_ERR_NODE_NOT_ALLOW_UPDATE:
     case NEU_ERR_NODE_NOT_ALLOW_SUBSCRIBE: