support LWIP and demo from Wang_Linyu Liu_Kai Yang Peihao Wang_Weigen

it is OK

APP_Framework/Applications/connection_app/Kconfig

@@ -1,3 +1,7 @@
 menu "connection app"
 
+    menuconfig APPLICATION_CONNECTION
+        bool "Using connection apps"
+        default n
+	
 endmenu

APP_Framework/Applications/connection_app/Makefile

@@ -1,3 +1,7 @@
 SRC_DIR :=
 
+ifeq ($(CONFIG_RESOURCES_LWIP),y)
+	SRC_DIR += socket_demo
+endif
+
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/connection_app/socket_demo/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := lwip_tcp_socket_demo.c lwip_udp_socket_demo.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c

@@ -0,0 +1,187 @@
+/*
+* Copyright (c) 2020 AIIT XUOS Lab
+* XiUOS is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*        http://license.coscl.org.cn/MulanPSL2
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+* See the Mulan PSL v2 for more details.
+*/
+
+/**
+* @file tcp_echo_socket_demo.c
+* @brief One UDP demo based on LwIP
+* @version 1.0
+* @author AIIT XUOS Lab
+* @date 2021-05-29
+*/
+#include <transform.h>
+#include <xiuos.h>
+#include "board.h"
+#include "sys_arch.h"
+#include <lwip/sockets.h>
+#include "lwip/sys.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+char tcp_socket_ip[] = {192, 168, 250, 252};
+
+#define TCP_BUF_SIZE 1024
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+static void tcp_recv_demo(void *arg)
+{
+    lw_print("tcp_recv_demo start.\n");
+
+    int fd = -1;
+    char *recv_buf;
+    struct sockaddr_in tcp_addr, server_addr;
+    int recv_len;
+    socklen_t addr_len;
+
+    while(1)
+    {
+        recv_buf = (char *)malloc(TCP_BUF_SIZE);
+        if (recv_buf == NULL)
+        {
+            lw_print("No memory\n");
+            goto __exit;
+        }
+
+        fd = socket(AF_INET, SOCK_STREAM, 0);
+        if (fd < 0)
+        {
+            lw_print("Socket error\n");
+            goto __exit;
+        }
+
+        tcp_addr.sin_family = AF_INET;
+        tcp_addr.sin_addr.s_addr = INADDR_ANY;
+        tcp_addr.sin_port = htons(LOCAL_PORT_SERVER);
+        memset(&(tcp_addr.sin_zero), 0, sizeof(tcp_addr.sin_zero));
+
+        if (bind(fd, (struct sockaddr *)&tcp_addr, sizeof(struct sockaddr)) == -1)
+        {
+            lw_print("Unable to bind\n");
+            goto __exit;
+        }
+
+        lw_print("tcp bind sucess, start to receive.\n");
+        lw_print("\n\nLocal Port:%d\n\n", LOCAL_PORT_SERVER);
+
+        while(1)
+        {
+            memset(recv_buf, 0, TCP_BUF_SIZE);
+            recv_len = recvfrom(fd, recv_buf, TCP_BUF_SIZE, 0, (struct sockaddr *)&server_addr, &addr_len);
+            lw_pr_info("Receive from : %s\n", inet_ntoa(server_addr.sin_addr));
+            lw_pr_info("Receive data : %s\n\n", recv_buf);
+            sendto(fd, recv_buf, recv_len, 0, (struct sockaddr*)&server_addr, addr_len);
+        }
+
+    __exit:
+        if (fd >= 0)
+            closesocket(fd);
+
+        if (recv_buf)
+            free(recv_buf);
+    }
+}
+
+void tcp_socket_recv_run(int argc, char *argv[])
+{
+    int result = 0;
+    pthread_t th_id;
+    pthread_attr_t attr;
+
+    if(argc == 2)
+    {
+        lw_print("lw: [%s] gw %s\n", __func__, argv[1]);
+        sscanf(argv[1], "%d.%d.%d.%d", &tcp_socket_ip[0], &tcp_socket_ip[1], &tcp_socket_ip[2], &tcp_socket_ip[3]);
+    }
+
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
+    sys_thread_new("tcp_recv_demo", tcp_recv_demo, NULL, 4096, 15);
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3),
+     TCPSocketRecv, tcp_socket_recv_run, TCP recv echo);
+
+static void tcp_send_demo(void *arg)
+{
+    int cnt = TEST_LWIP_TIMES;
+    lw_print("tcp_send_demo start.\n");
+    int fd = -1;
+    char send_msg[128];
+
+    memset(send_msg, 0, sizeof(send_msg));
+    fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (fd < 0)
+    {
+        lw_print("Socket error\n");
+        goto __exit;
+    }
+
+    struct sockaddr_in tcp_sock;
+    tcp_sock.sin_family = AF_INET;
+    tcp_sock.sin_port = htons(TARGET_PORT_CLIENT);
+    tcp_sock.sin_addr.s_addr = PP_HTONL(LWIP_MAKEU32(tcp_socket_ip[0],tcp_socket_ip[1],tcp_socket_ip[2],tcp_socket_ip[3]));
+    memset(&(tcp_sock.sin_zero), 0, sizeof(tcp_sock.sin_zero));
+
+    if (connect(fd, (struct sockaddr *)&tcp_sock, sizeof(struct sockaddr)))
+    {
+        lw_print("Unable to connect\n");
+        goto __exit;
+    }
+
+    lw_print("tcp connect success, start to send.\n");
+    lw_print("\n\nTarget Port:%d\n\n", tcp_sock.sin_port);
+
+    while (cnt --)
+    {
+        lw_print("Lwip client is running.\n");
+        snprintf(send_msg, sizeof(send_msg), "TCP test package times %d\r\n", cnt);
+        sendto(fd, send_msg, strlen(send_msg), 0, (struct sockaddr*)&tcp_sock, sizeof(struct sockaddr));
+        lw_print("Send tcp msg: %s ", send_msg);
+        MdelayKTask(1000);
+    }
+
+__exit:
+    if (fd >= 0)
+        closesocket(fd);
+
+    return;
+}
+
+
+void tcp_socket_send_run(int argc, char *argv[])
+{
+    if(argc == 2)
+    {
+        lw_print("lw: [%s] gw %s\n", __func__, argv[1]);
+        sscanf(argv[1], "%d.%d.%d.%d", &tcp_socket_ip[0], &tcp_socket_ip[1], &tcp_socket_ip[2], &tcp_socket_ip[3]);
+    }
+
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
+    sys_thread_new("tcp socket", tcp_send_demo, NULL, 4096, 25);
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0),
+     TCPSocketSend, tcp_socket_send_run, TCP send demo);
+

APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c

@@ -0,0 +1,209 @@
+/*
+* Copyright (c) 2020 AIIT XUOS Lab
+* XiUOS is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*        http://license.coscl.org.cn/MulanPSL2
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+* See the Mulan PSL v2 for more details.
+*/
+
+/**
+* @file lwip_udp_socket_demo.c
+* @brief One UDP demo based on LwIP
+* @version 1.0
+* @author AIIT XUOS Lab
+* @date 2021-05-29
+*/
+#include <transform.h>
+#include <xiuos.h>
+#include "board.h"
+#include "sys_arch.h"
+#include "lwip/udp.h"
+#include "lwip/opt.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+extern char udp_target[];
+static struct udp_pcb *udpecho_raw_pcb;
+char udp_socket_ip[] = {192, 168, 250, 252};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+#include <lwip/sockets.h>
+#include "lwip/sys.h"
+
+#define LWIP_UDP_TASK_STACK 4096
+#define LWIP_UDP_TASK_PRIO 25
+#define UDP_BUF_SIZE 1024
+
+static void udp_recv_demo(void *arg)
+{
+    lw_print("udp_recv_demo start.\n");
+
+    int socket_fd = -1;
+    char *recv_buf;
+    struct sockaddr_in udp_addr, server_addr;
+    int recv_len;
+    socklen_t addr_len;
+
+    while(1)
+    {
+        recv_buf = (char *)malloc(UDP_BUF_SIZE);
+        if (recv_buf == NULL)
+        {
+            lw_print("No memory\n");
+            goto __exit;
+        }
+
+        socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
+        if (socket_fd < 0)
+        {
+            lw_print("Socket error\n");
+            goto __exit;
+        }
+
+        udp_addr.sin_family = AF_INET;
+        udp_addr.sin_addr.s_addr = INADDR_ANY;
+        udp_addr.sin_port = htons(LOCAL_PORT_SERVER);
+        memset(&(udp_addr.sin_zero), 0, sizeof(udp_addr.sin_zero));
+
+        if (bind(socket_fd, (struct sockaddr *)&udp_addr, sizeof(struct sockaddr)) == -1)
+        {
+            lw_print("Unable to bind\n");
+            goto __exit;
+        }
+
+        lw_print("UDP bind sucess, start to receive.\n");
+        lw_print("\n\nLocal Port:%d\n\n", LOCAL_PORT_SERVER);
+
+        while(1)
+        {
+            memset(recv_buf, 0, UDP_BUF_SIZE);
+            recv_len = recvfrom(socket_fd, recv_buf, UDP_BUF_SIZE, 0, (struct sockaddr *)&server_addr, &addr_len);
+            lw_print("Receive from : %s\n", inet_ntoa(server_addr.sin_addr));
+            lw_print("Receive data : %s\n\n", recv_buf);
+            sendto(socket_fd, recv_buf, recv_len, 0, (struct sockaddr*)&server_addr, addr_len);
+        }
+
+    __exit:
+        if (socket_fd >= 0)
+            closesocket(socket_fd);
+
+        if (recv_buf)
+            free(recv_buf);
+    }
+}
+
+static void udp_recv_demo_thread(void* param)
+{
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
+    sys_thread_new("udp_recv_demo", udp_recv_demo, NULL, LWIP_UDP_TASK_STACK, LWIP_UDP_TASK_PRIO);
+}
+
+void udp_socket_recv_run(int argc, char *argv[])
+{
+    int result = 0;
+    pthread_t th_id;
+    pthread_attr_t attr;
+
+    if(argc == 2)
+    {
+        lw_print("lw: [%s] gw %s\n", __func__, argv[1]);
+        sscanf(argv[1], "%d.%d.%d.%d", &udp_socket_ip[0], &udp_socket_ip[1], &udp_socket_ip[2], &udp_socket_ip[3]);
+    }
+
+    sys_thread_new("udp socket send", udp_recv_demo_thread, NULL, 4096, 15);
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3),
+     UDPSocketRecv, udp_socket_recv_run, UDP recv echo);
+
+static void udp_send_demo(void *arg)
+{
+    int cnt = TEST_LWIP_TIMES;
+    char send_str[128];
+
+    lw_print("udp_send_demo start.\n");
+
+    int socket_fd = -1;
+    memset(send_str, 0, sizeof(send_str));
+
+    socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (socket_fd < 0)
+    {
+        lw_print("Socket error\n");
+        goto __exit;
+    }
+
+    struct sockaddr_in udp_sock;
+    udp_sock.sin_family = AF_INET;
+    udp_sock.sin_port = htons(TARGET_PORT_CLIENT);
+    udp_sock.sin_addr.s_addr = PP_HTONL(LWIP_MAKEU32(udp_target[0],udp_target[1],udp_target[2],udp_target[3]));
+    memset(&(udp_sock.sin_zero), 0, sizeof(udp_sock.sin_zero));
+
+    if (connect(socket_fd, (struct sockaddr *)&udp_sock, sizeof(struct sockaddr)))
+    {
+        lw_print("Unable to connect\n");
+        goto __exit;
+    }
+
+    lw_print("UDP connect success, start to send.\n");
+    lw_print("\n\nTarget Port:%d\n\n", udp_sock.sin_port);
+
+    while (cnt --)
+    {
+        snprintf(send_str, sizeof(send_str), "UDP test package times %d\r\n", cnt);
+        sendto(socket_fd, send_str, strlen(send_str), 0, (struct sockaddr*)&udp_sock, sizeof(struct sockaddr));
+        lw_pr_info("Send UDP msg: %s ", send_str);
+        MdelayKTask(1000);
+    }
+
+__exit:
+    if (socket_fd >= 0)
+    {
+        closesocket(socket_fd);
+    }
+
+    return;
+}
+
+static void udp_send_demo_thread(void* param)
+{
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr);
+    sys_thread_new("udp_send_demo", udp_send_demo, NULL, LWIP_UDP_TASK_STACK, LWIP_UDP_TASK_PRIO);
+}
+
+void udp_socket_send_run(int argc, char *argv[])
+{
+    int result = 0;
+    pthread_t th_id;
+    pthread_attr_t attr;
+
+    if(argc == 2)
+    {
+        lw_print("lw: [%s] gw %s\n", __func__, argv[1]);
+        sscanf(argv[1], "%d.%d.%d.%d", &udp_socket_ip[0], &udp_socket_ip[1], &udp_socket_ip[2], &udp_socket_ip[3]);
+    }
+
+    sys_thread_new("udp socket send", udp_send_demo_thread, NULL, 4096, 15);
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3),
+     UDPSocketSend, udp_socket_send_run, UDP send echo);
+

APP_Framework/Applications/control_app/Kconfig

@@ -3,6 +3,7 @@ menu "control app"
     menuconfig APPLICATION_CONTROL
         bool "Using control apps"
         default n
+        depends on SUPPORT_CONTROL_FRAMEWORK
 
 endmenu
 

APP_Framework/Applications/control_app/Makefile

@@ -0,0 +1,11 @@
+SRC_DIR :=
+
+ifeq ($(CONFIG_RESOURCES_LWIP),y)
+
+ifeq ($(CONFIG_USING_CONTROL_PLC_OPCUA), y)
+	SRC_DIR += opcua_demo
+endif
+
+endif
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/control_app/opcua_demo/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES :=opcua_demo.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/control_app/opcua_demo/opcua_demo.c

@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2021 AIIT XUOS Lab
+ * XiUOS is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *        http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+/**
+ * @file ua_demo.c
+ * @brief Demo for OpcUa function
+ * @version 1.0
+ * @author AIIT XUOS Lab
+ * @date 2021.11.11
+ */
+
+#include <list.h>
+#include <transform.h>
+#include "board.h"
+#include <lwip/altcp.h>
+#include "open62541.h"
+#include "ua_api.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+//#define ua_print KPrintf
+#define ua_trace() KPrintf("ua: [%s] %d pass!\n", __func__, __LINE__)
+
+#define TCP_LOCAL_PORT 4840
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+const char *test_uri = "opc.tcp://192.168.250.5:4840";
+const char *test_cb_str = "tcp client connected\r\n";
+
+char test_ua_gw[] = {192, 168, 250, 5};
+
+static pthread_t eth_input_id = 0;
+static pthread_t ua_demo_id;
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+void *test_ua_get_server_info(void *param);
+
+static void test_ua_connect(void *arg)
+{
+    struct netif net;
+    UA_StatusCode retval;
+
+    UA_Client *client = UA_Client_new();
+
+    if (client == NULL)
+    {
+        ua_print("ua: [%s] tcp client null\n", __func__);
+        return;
+    }
+
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+
+    retval = UA_Client_connect(client, test_uri);
+    if (retval != UA_STATUSCODE_GOOD)
+    {
+        ua_print("ua: [%s] ret %x\n", __func__, retval);
+    }
+
+    ua_print("ua: [%s] start Ua Test!\n", __func__);
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+
+void test_ua_connect_thr(void *arg)
+{
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, test_ua_gw);
+    test_ua_connect(NULL);
+}
+
+void test_sh_ua_connect(void)
+{
+    int result = 0;
+    pthread_t th_id;
+    pthread_attr_t attr;
+    sys_thread_new("ua test", test_ua_connect_thr, NULL, 4096, 15);
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0),
+                 UaConnect, test_sh_ua_connect, Test Opc UA connection);
+
+void *test_ua_get_server_info(void *param)
+{
+    UA_Client *client = UA_Client_new();
+
+    ua_print("ua: [%s] start ...\n", __func__);
+
+    if (client == NULL)
+    {
+        ua_print("ua: [%s] tcp client null\n", __func__);
+        return NULL;
+    }
+
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+
+    UA_StatusCode retval = UA_Client_connect(client, OPC_SERVER);
+    if(retval != UA_STATUSCODE_GOOD) {
+        ua_print("ua: [%s] connect failed %#x\n", __func__, retval);
+        UA_Client_delete(client);
+        return NULL;
+    }
+
+    ua_print("ua: [%s] connect ok!\n", __func__);
+
+    ua_read_time(client);
+    ua_get_server_info(client);
+
+    /* Clean up */
+    UA_Client_disconnect(client);
+    UA_Client_delete(client); /* Disconnects the client internally */
+}
+
+void *test_ua_get_server_info_thr(void *arg)
+{
+    ETH_BSP_Config();
+    lwip_config_tcp(lwip_ipaddr, lwip_netmask, test_ua_gw);
+    test_ua_get_server_info(NULL);
+}
+
+void *test_sh_ua_get_server_info(void *param)
+{
+    int result = 0;
+    pthread_attr_t attr;
+
+    attr.schedparam.sched_priority = 15;
+    attr.stacksize = 4096;
+
+    result = pthread_create(&ua_demo_id, &attr, test_ua_get_server_info_thr, NULL);
+    if (0 == result) {
+        lw_print("test_ua_get_server_info %d successfully!\n", __func__, ua_demo_id);
+    } else {
+        lw_print("test_ua_get_server_info failed! error code is %d\n", __func__, result);
+    }
+}
+
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0),
+                 UaGetInfo, test_sh_ua_get_server_info, Get information from OpcUA server);
+