Merge pull request #1947 from zhaojuntao/update-examples

[examples][network] 更新 tcp/udp client & server 例程

Author: BernardXiong

examples/network/tcpclient.c

@@ -1,39 +1,69 @@
 #include <rtthread.h>
+#include <string.h>
 
+#if !defined(SAL_USING_POSIX)
+#error "Please enable SAL_USING_POSIX!"
+#else
+#include <sys/time.h>
+#include <sys/select.h>
+#endif
 #include <sys/socket.h> /* 使用BSD socket，需要包含socket.h头文件 */
 #include "netdb.h"
 
+#define DEBUG_TCP_CLIENT
+
+#define DBG_ENABLE
+#define DBG_SECTION_NAME               "TCP"
+#ifdef DEBUG_TCP_CLIENT
+#define DBG_LEVEL                      DBG_LOG
+#else
+#define DBG_LEVEL                      DBG_INFO /* DBG_ERROR */
+#endif
+#define DBG_COLOR
+#include <rtdbg.h>
+
 #define BUFSZ   1024
 
+static int started = 0;
+static int is_running = 0;
+static char url[256];
+static int port = 8080;
 static const char send_data[] = "This is TCP Client from RT-Thread."; /* 发送用到的数据 */
-void tcpclient(const char *url, int port)
+
+static void tcpclient(void *arg)
 {
     int ret;
     char *recv_data;
-    struct hostent *host;
-    int sock, bytes_received;
+    int bytes_received;
+    int sock = -1;
+    struct hostent *host = RT_NULL;
     struct sockaddr_in server_addr;
 
+    struct timeval timeout;
+    fd_set readset;
+
     /* 通过函数入口参数url获得host地址（如果是域名，会做域名解析） */
     host = gethostbyname(url);
+    if (host == RT_NULL)
+    {
+        LOG_E("Get host by name failed!");
+        return;
+    }
 
     /* 分配用于存放接收数据的缓冲 */
     recv_data = rt_malloc(BUFSZ);
     if (recv_data == RT_NULL)
     {
-        rt_kprintf("No memory\n");
+        LOG_E("No memory");
         return;
     }
 
     /* 创建一个socket，类型是SOCKET_STREAM，TCP类型 */
     if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
     {
         /* 创建socket失败 */
-        rt_kprintf("Socket error\n");
-
-        /* 释放接收缓冲 */
-        rt_free(recv_data);
-        return;
+        LOG_E("Create socket error");
+        goto __exit;
     }
 
     /* 初始化预连接的服务端地址 */
@@ -46,78 +76,159 @@ void tcpclient(const char *url, int port)
     if (connect(sock, (struct sockaddr *)&server_addr, sizeof(struct sockaddr)) == -1)
     {
         /* 连接失败 */
-        rt_kprintf("Connect fail!\n");
-        closesocket(sock);
-
-        /*释放接收缓冲 */
-        rt_free(recv_data);
-        return;
+        LOG_E("Connect fail!");
+        goto __exit;
     }
 
-    while (1)
+    started = 1;
+    is_running = 1;
+
+    timeout.tv_sec = 3;
+    timeout.tv_usec = 0;
+
+    while (is_running)
     {
+        FD_ZERO(&readset);
+        FD_SET(sock, &readset);
+
+        /* Wait for read */
+        if (select(sock + 1, &readset, RT_NULL, RT_NULL, &timeout) == 0)
+            continue;
+
         /* 从sock连接中接收最大BUFSZ - 1字节数据 */
         bytes_received = recv(sock, recv_data, BUFSZ - 1, 0);
         if (bytes_received < 0)
         {
             /* 接收失败，关闭这个连接 */
-            closesocket(sock);
-            rt_kprintf("\nreceived error,close the socket.\r\n");
-
-            /* 释放接收缓冲 */
-            rt_free(recv_data);
-            break;
+            LOG_E("Received error, close the socket.");
+            goto __exit;
         }
         else if (bytes_received == 0)
         {
             /* 打印recv函数返回值为0的警告信息 */
-            rt_kprintf("\nReceived warning,recv function return 0.\r\n");
-
+            LOG_W("Received warning, recv function return 0.");
             continue;
         }
-
-        /* 有接收到数据，把末端清零 */
-        recv_data[bytes_received] = '\0';
-
-        if (strcmp(recv_data, "q") == 0 || strcmp(recv_data, "Q") == 0)
-        {
-            /* 如果是首字母是q或Q，关闭这个连接 */
-            closesocket(sock);
-            rt_kprintf("\n got a 'q' or 'Q',close the socket.\r\n");
-
-            /* 释放接收缓冲 */
-            rt_free(recv_data);
-            break;
-        }
         else
         {
-            /* 在控制终端显示收到的数据 */
-            rt_kprintf("\nReceived data = %s ", recv_data);
+            /* 有接收到数据，把末端清零 */
+            recv_data[bytes_received] = '\0';
+
+            if (rt_strcmp(recv_data, "q") == 0 || rt_strcmp(recv_data, "Q") == 0)
+            {
+                /* 如果是首字母是q或Q，关闭这个连接 */
+                LOG_I("Got a 'q' or 'Q', close the socket.");
+                goto __exit;
+            }
+            else
+            {
+                /* 在控制终端显示收到的数据 */
+                LOG_D("Received data = %s", recv_data);
+            }
         }
 
         /* 发送数据到sock连接 */
-        ret = send(sock, send_data, strlen(send_data), 0);
+        ret = send(sock, send_data, rt_strlen(send_data), 0);
         if (ret < 0)
         {
             /* 接收失败，关闭这个连接 */
-            closesocket(sock);
-            rt_kprintf("\nsend error,close the socket.\r\n");
-
-            rt_free(recv_data);
-            break;
+            LOG_I("send error, close the socket.");
+            goto __exit;
         }
         else if (ret == 0)
         {
             /* 打印send函数返回值为0的警告信息 */
-            rt_kprintf("\n Send warning,send function return 0.\r\n");
+            LOG_W("Send warning, send function return 0.");
+        }
+    }
+
+__exit:
+    if (recv_data)
+    {
+        rt_free(recv_data);
+        recv_data = RT_NULL;
+    }
+    if (sock >= 0)
+    {
+        closesocket(sock);
+        sock = -1;
+    }
+    started = 0;
+    is_running = 0;
+    return;
+}
+
+static void usage(void)
+{
+    rt_kprintf("Usage: tcpclient -h <host> -p <port>\n");
+    rt_kprintf("       tcpclient --stop\n");
+    rt_kprintf("       tcpclient --help\n");
+    rt_kprintf("\n");
+    rt_kprintf("Miscellaneous:\n");
+    rt_kprintf("  -h           Specify host address\n");
+    rt_kprintf("  -p           Specify the host port number\n");
+    rt_kprintf("  --stop       Stop tcpclient program\n");
+    rt_kprintf("  --help       Print help information\n");
+}
+
+static void tcpclient_test(int argc, char** argv)
+{
+    rt_thread_t tid;
+
+    if (argc == 1 || argc > 5)
+    {
+        LOG_I("Please check the command you entered!\n");
+        goto __usage;
+    }
+    else
+    {
+        if (rt_strcmp(argv[1], "--help") == 0)
+        {
+            goto __usage;
+        }
+        else if (rt_strcmp(argv[1], "--stop") == 0)
+        {
+            is_running = 0;
+            return;
+        }
+        else if (rt_strcmp(argv[1], "-h") == 0 && rt_strcmp(argv[3], "-p") == 0)
+        {
+            if (started)
+            {
+                LOG_I("The tcpclient has started!");
+                LOG_I("Please stop tcpclient firstly, by: tcpclient --stop");
+                return;
+            }
+
+            if (rt_strlen(argv[2]) > sizeof(url))
+            {
+                LOG_E("The input url is too long, max %d bytes!", sizeof(url));
+                return;
+            }
+            rt_memset(url, 0x0, sizeof(url));
+            rt_strncpy(url, argv[2], rt_strlen(argv[2]));
+            port = atoi(argv[4]);
+        }
+        else
+        {
+            goto __usage;
         }
     }
 
+    tid = rt_thread_create("tcp_client",
+        tcpclient, RT_NULL,
+        2048, RT_THREAD_PRIORITY_MAX/3, 20);
+    if (tid != RT_NULL)
+    {
+        rt_thread_startup(tid);
+    }
     return;
+
+__usage:
+    usage();
 }
 
 #ifdef RT_USING_FINSH
-#include <finsh.h>
-/* 输出tcpclient函数到finsh shell中 */
-FINSH_FUNCTION_EXPORT(tcpclient, startup tcp client);
+MSH_CMD_EXPORT_ALIAS(tcpclient_test, tcpclient,
+    Start a tcp client. Help: tcpclient --help);
 #endif