diff --git a/TSCP/src/MSCP/CFM/CFM_Net.c b/TSCP/src/MSCP/CFM/CFM_Net.c index 6f0c7a8..6443a66 100644 --- a/TSCP/src/MSCP/CFM/CFM_Net.c +++ b/TSCP/src/MSCP/CFM/CFM_Net.c @@ -304,6 +304,7 @@ static void s_NetInit_2oo2(void) /*- 变量初始化 */ ENUM_CM_RETURN rt = ENUM_CM_FALSE; /* 临时变量 */ CM_INT32 val = 0; /* 临时变量 */ + unsigned int optLen = 0u; /* socket选项值长度 */ CM_BOOL rtCheck = CM_FALSE; /* 临时变量 */ /*- 创建平台数据2取socket */ @@ -334,6 +335,47 @@ static void s_NetInit_2oo2(void) (void)setsockopt(s_CFM_Sock.Sock_2oo2_Data, SOL_SOCKET, SO_SNDBUF, (void*)(&val), (unsigned int)sizeof(val)); (void)setsockopt(s_CFM_Sock.Sock_2oo2_Data_App, SOL_SOCKET, SO_RCVBUF, (void*)(&val), (unsigned int)sizeof(val)); (void)setsockopt(s_CFM_Sock.Sock_2oo2_Data_App, SOL_SOCKET, SO_SNDBUF, (void*)(&val), (unsigned int)sizeof(val)); + + /*- 读取并打印socket实际生效的接收、发送缓冲区大小 */ + optLen = (unsigned int)sizeof(val); + if (0 == getsockopt(s_CFM_Sock.Sock_2oo2_Data, SOL_SOCKET, SO_RCVBUF, (void*)(&val), &optLen)) + { + (void)printf("Sock_2oo2_Data SO_RCVBUF = %d bytes\n", val); + } + else + { + (void)printf("Sock_2oo2_Data SO_RCVBUF getsockopt failed\n"); + } + + optLen = (unsigned int)sizeof(val); + if (0 == getsockopt(s_CFM_Sock.Sock_2oo2_Data, SOL_SOCKET, SO_SNDBUF, (void*)(&val), &optLen)) + { + (void)printf("Sock_2oo2_Data SO_SNDBUF = %d bytes\n", val); + } + else + { + (void)printf("Sock_2oo2_Data SO_SNDBUF getsockopt failed\n"); + } + + optLen = (unsigned int)sizeof(val); + if (0 == getsockopt(s_CFM_Sock.Sock_2oo2_Data_App, SOL_SOCKET, SO_RCVBUF, (void*)(&val), &optLen)) + { + (void)printf("Sock_2oo2_Data_App SO_RCVBUF = %d bytes\n", val); + } + else + { + (void)printf("Sock_2oo2_Data_App SO_RCVBUF getsockopt failed\n"); + } + + optLen = (unsigned int)sizeof(val); + if (0 == getsockopt(s_CFM_Sock.Sock_2oo2_Data_App, SOL_SOCKET, SO_SNDBUF, (void*)(&val), &optLen)) + { + (void)printf("Sock_2oo2_Data_App SO_SNDBUF = %d bytes\n", val); + } + else + { + (void)printf("Sock_2oo2_Data_App SO_SNDBUF getsockopt failed\n"); + } /*- 初始化控制信息 */ /*- 配置接收线程 */ diff --git a/TSCP/src/MSCP/CFM/CFM_Net.h b/TSCP/src/MSCP/CFM/CFM_Net.h index 983efa1..b32c8aa 100644 --- a/TSCP/src/MSCP/CFM/CFM_Net.h +++ b/TSCP/src/MSCP/CFM/CFM_Net.h @@ -35,7 +35,7 @@ extern "C" #define NET_UDP_MAINTENANCE_BUF_SIZE ((1024*5)-(1)) /*2OO2UDP协议栈缓冲区大小(维护模式下用于接收代码)*/ #define NET_UDP_2X2_BUF_SIZE ((1024*64)-(1)) /*2X2UDP协议栈缓冲区大小(用于接收代码)*/ #define NET_UDP_BUF_SIZE ((1024*64)-(1)) /*UDPsocket消息队列缓冲区(用于接收代码)*/ -#define NET_UDP_BUF_DOUBLESIZE ((1024*256) - (1)) /*UDP协议栈缓冲区大小(用于接收代码)*/ +#define NET_UDP_BUF_DOUBLESIZE ((2*1024*1024) - (1)) /*UDP协议栈缓冲区大小(用于接收代码)*/ #define NET_50K_SIZE (50000u) /*实际允许使用的应用帧大小(用于发送代码)*/ #define NET_20K_SIZE (20000u) /*实际允许使用的应用帧大小(用于发送代码)*/ diff --git a/TSCP/src/MSCP/SFM/SFM_2x2.c b/TSCP/src/MSCP/SFM/SFM_2x2.c index d05b1d1..6576d99 100644 --- a/TSCP/src/MSCP/SFM/SFM_2x2.c +++ b/TSCP/src/MSCP/SFM/SFM_2x2.c @@ -1866,7 +1866,7 @@ static void s_2x2_Recv(void) ENUM_CM_RETURN ret = ENUM_CM_FALSE; /* 临时变量 */ PFM_LOG_SET_STOPTIMER(TSCP_DARK_2x2); /*- 以太网循环接收2x2数据 */ - if(CM_TRUE == s_2x2_Ctrl.TimeSyncFlag) + if(CM_TRUE == CFM_GetTimeSyncFlag()) { do {