Add new flow to ethernet/ip protocol

Author: rtorresmatheus

Dockerfile

@@ -4,11 +4,11 @@ FROM alpine:3.10.3 AS builder
 ARG LIBELL_VERSION=0.18
 ARG JSONC_VERSION=0.14-20200419
 ARG RABBITMQC_VERSION=v0.10.0
-ARG KNOT_CLOUD_SDK_VERSION=bdc4130
-ARG KNOT_PROTOCOL_VERSION=5f4e9c6
+ARG KNOT_CLOUD_SDK_VERSION=KNoTU-v3.2.0-rc05
+ARG KNOT_PROTOCOL_VERSION=KNoTU-v3.2.0-rc05
 ARG LIBMODBUS_VERSION=3.1.4
-ARG LIBPLCTAG_VERSION=v2.5.0
-ARG LIBOPEN62541_VERSION=23c8586
+ARG LIBPLCTAG_VERSION=v2.5.4
+ARG LIBOPEN62541_VERSION=v1.3.4
 
 WORKDIR /usr/local
 
@@ -47,7 +47,7 @@ RUN cd libmodbus && ./configure --prefix=/usr -q && make install
 
 # Install open62541 dependency. While the fix for checking StatusCode is not approved, it is necessary to use a specific branch of IOTechSystems.
 RUN mkdir -p /usr/local/libplctag
-RUN git clone https://github.com/IOTechSystems/open62541.git /usr/local/open62541
+RUN git clone https://github.com/open62541/open62541.git /usr/local/open62541
 RUN cd open62541 && git checkout $LIBOPEN62541_VERSION && git submodule update --init --recursive && mkdir -p build
 RUN cd open62541/build && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib DLIB_INSTALL_DIR=lib -DCMAKE_BUILD_TYPE=Release -DUA_NAMESPACE_ZERO=FULL -DUA_ENABLE_ENCRYPTION=OPENSSL  -DUA_ARCH_REMOVE_FLAGS="-Werror" ..
 RUN cd open62541/build && make install

src/iface-ethernet-ip.c

@@ -32,6 +32,7 @@ static iface_ethernet_ip_disconnected_cb_t disconn_cb;
 static struct l_timeout *connect_to;
 struct knot_thing thing_ethernet_ip;
 static struct l_io *ethernet_op_io;
+static int status_ethernet_ip;
 
 union ethernet_ip_types {
 	float val_float;
@@ -113,12 +114,6 @@ static int connect_ethernet_ip(struct knot_data_item *data_item)
 {
 	int rc = 0;
 
-	/* Check and destroy if an IO is already allocated */
-	if (ethernet_op_io) {
-		l_io_destroy(ethernet_op_io);
-		ethernet_op_io = NULL;
-	}
-
 	plc_tag_destroy(data_item->tag);
 	data_item->tag = plc_tag_create(data_item->string_tag_path,
 					DATA_TIMEOUT);
@@ -131,20 +126,6 @@ static int connect_ethernet_ip(struct knot_data_item *data_item)
 		return -EINVAL;
 	}
 
-	ethernet_op_io = l_io_new(plc_tag_status(data_item->tag));
-	if (!ethernet_op_io) {
-		l_error("Error setting up tag internal state. %s",
-			plc_tag_decode_error(
-				data_item->tag));
-		return -EIO;
-	}
-
-	if (!l_io_set_disconnect_handler(ethernet_op_io, on_disconnected, NULL,
-					 NULL)) {
-		l_error("Couldn't set Ethernet/IP disconnect handler");
-		return -EINVAL;
-	}
-
 	return rc;
 }
 
@@ -188,21 +169,40 @@ static void attempt_connect(struct l_timeout *to, void *user_data)
 
 	l_debug("Trying to connect to Ethernet/Ip");
 
+	/* Check and destroy if an IO is already allocated */
+	if (ethernet_op_io) {
+		l_io_destroy(ethernet_op_io);
+		ethernet_op_io = NULL;
+	}
+
 	l_hashmap_foreach(thing_ethernet_ip.data_items,
 			  foreach_data_item_ethernet_ip, &rc);
 	if (rc) {
 		l_error("error connecting to Ethernet/Ip");
 		goto retry;
 	}
 
+	ethernet_op_io = l_io_new(status_ethernet_ip);
+	if (!ethernet_op_io) {
+		l_error("Error setting up tag internal state.");
+		goto io_destroy;
+	}
+
+	if (!l_io_set_disconnect_handler(ethernet_op_io, on_disconnected, NULL,
+					 NULL)) {
+		l_error("Couldn't set Ethernet/IP disconnect handler");
+		goto io_destroy;
+	}
+
 	if (conn_cb)
 		conn_cb(user_data);
 
 	return;
 
-retry:
+io_destroy:
 	l_io_destroy(ethernet_op_io);
 	ethernet_op_io = NULL;
+retry:
 	l_timeout_modify(to, RECONNECT_TIMEOUT);
 }