From e20fb2f5b2130093191f818d307bb9cc30b0bc28 Mon Sep 17 00:00:00 2001 From: aozima Date: Tue, 6 Feb 2018 18:59:24 +0800 Subject: [examples] update: 1. cleanup for posix dfs_net. 2. fixed recv buf overwrite. 3. format code. --- examples/network/udpserver.c | 153 +++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 77 deletions(-) (limited to 'examples/network/udpserver.c') diff --git a/examples/network/udpserver.c b/examples/network/udpserver.c index 3b5abd976b..a684e9cd0c 100644 --- a/examples/network/udpserver.c +++ b/examples/network/udpserver.c @@ -1,85 +1,84 @@ #include -//#include /* 使用BSD socket，需要包含sockets.h头文件 */ -#include /* 使用BSD socket，需要包含sockets.h头文件 */ -#include "netdb.h" +#include /* 使用BSD socket，需要包含socket.h头文件 */ +#include "netdb.h" -#define BUFSZ 1024 +#define BUFSZ 1024 -void udpserv(void* paramemter) +static void udpserv(void *paramemter) { - int sock; - int bytes_read; - char *recv_data; - rt_uint32_t addr_len; - struct sockaddr_in server_addr, client_addr; - - /* 分配接收用的数据缓冲 */ - recv_data = rt_malloc(BUFSZ); - if (recv_data == RT_NULL) - { - /* 分配内存失败，返回 */ - rt_kprintf("No memory\n"); - return; - } - - /* 创建一个socket，类型是SOCK_DGRAM，UDP类型 */ - if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - { - rt_kprintf("Socket error\n"); - - /* 释放接收用的数据缓冲 */ - rt_free(recv_data); - return; - } - - /* 初始化服务端地址 */ - server_addr.sin_family = AF_INET; - server_addr.sin_port = htons(5000); - server_addr.sin_addr.s_addr = INADDR_ANY; - rt_memset(&(server_addr.sin_zero),0, sizeof(server_addr.sin_zero)); - - /* 绑定socket到服务端地址 */ - if (bind(sock,(struct sockaddr *)&server_addr, - sizeof(struct sockaddr)) == -1) - { - /* 绑定地址失败 */ - rt_kprintf("Bind error\n"); - - /* 释放接收用的数据缓冲 */ - rt_free(recv_data); - return; - } - - addr_len = sizeof(struct sockaddr); - rt_kprintf("UDPServer Waiting for client on port 5000...\n"); - - while (1) - { - /* 从sock中收取最大BUFSZ - 1字节数据 */ - bytes_read = recvfrom(sock, recv_data, BUFSZ - 1, 0, - (struct sockaddr *)&client_addr, &addr_len); - /* UDP不同于TCP，它基本不会出现收取的数据失败的情况，除非设置了超时等待 */ - - recv_data[bytes_read] = '\0'; /* 把末端清零 */ - - /* 输出接收的数据 */ - rt_kprintf("\n(%s , %d) said : ",inet_ntoa(client_addr.sin_addr), - ntohs(client_addr.sin_port)); - rt_kprintf("%s", recv_data); - - /* 如果接收数据是exit，退出 */ - if (strcmp(recv_data, "exit") == 0) - { - closesocket(sock); - - /* 释放接收用的数据缓冲 */ - rt_free(recv_data); - break; - } - } - - return; + int sock; + int bytes_read; + char *recv_data; + socklen_t addr_len; + struct sockaddr_in server_addr, client_addr; + + /* 分配接收用的数据缓冲 */ + recv_data = rt_malloc(BUFSZ); + if (recv_data == RT_NULL) + { + /* 分配内存失败，返回 */ + rt_kprintf("No memory\n"); + return; + } + + /* 创建一个socket，类型是SOCK_DGRAM，UDP类型 */ + if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + { + rt_kprintf("Socket error\n"); + + /* 释放接收用的数据缓冲 */ + rt_free(recv_data); + return; + } + + /* 初始化服务端地址 */ + server_addr.sin_family = AF_INET; + server_addr.sin_port = htons(5000); + server_addr.sin_addr.s_addr = INADDR_ANY; + rt_memset(&(server_addr.sin_zero), 0, sizeof(server_addr.sin_zero)); + + /* 绑定socket到服务端地址 */ + if (bind(sock, (struct sockaddr *)&server_addr, + sizeof(struct sockaddr)) == -1) + { + /* 绑定地址失败 */ + rt_kprintf("Bind error\n"); + + /* 释放接收用的数据缓冲 */ + rt_free(recv_data); + return; + } + + addr_len = sizeof(struct sockaddr); + rt_kprintf("UDPServer Waiting for client on port 5000...\n"); + + while (1) + { + /* 从sock中收取最大BUFSZ - 1字节数据 */ + bytes_read = recvfrom(sock, recv_data, BUFSZ - 1, 0, + (struct sockaddr *)&client_addr, &addr_len); + /* UDP不同于TCP，它基本不会出现收取的数据失败的情况，除非设置了超时等待 */ + + recv_data[bytes_read] = '\0'; /* 把末端清零 */ + + /* 输出接收的数据 */ + rt_kprintf("\n(%s , %d) said : ", inet_ntoa(client_addr.sin_addr), + ntohs(client_addr.sin_port)); + rt_kprintf("%s", recv_data); + + /* 如果接收数据是exit，退出 */ + if (strcmp(recv_data, "exit") == 0) + { + closesocket(sock); + + /* 释放接收用的数据缓冲 */ + rt_free(recv_data); + break; + } + } + + return; } #ifdef RT_USING_FINSH -- cgit v1.3.1