diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index d85559ae..f864fd6f 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -9393,8 +9393,8 @@ void CmPrintStatusToListViewEx(LVB *b, RPC_CLIENT_GET_CONNECTION_STATUS *s, bool GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->StartTime), NULL); LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_START_TIME"), tmp); - GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablisiedTime), NULL); - LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablisiedTime == 0 ? _UU("CM_ST_NONE") : tmp); + GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablishedTime), NULL); + LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablishedTime == 0 ? _UU("CM_ST_NONE") : tmp); if (s->Connected) { @@ -9404,7 +9404,7 @@ void CmPrintStatusToListViewEx(LVB *b, RPC_CLIENT_GET_CONNECTION_STATUS *s, bool if (server_mode == false) { - UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEatablished); + UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEstablished); LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_NUM_ESTABLISHED"), tmp); } diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c index dcb2487e..d71a4fff 100644 --- a/src/Cedar/Client.c +++ b/src/Cedar/Client.c @@ -5000,14 +5000,14 @@ void InRpcClientGetConnectionStatus(RPC_CLIENT_GET_CONNECTION_STATUS *s, PACK *p s->ServerPort = PackGetInt(p, "ServerPort"); s->ServerProductVer = PackGetInt(p, "ServerProductVer"); s->ServerProductBuild = PackGetInt(p, "ServerProductBuild"); - s->NumConnectionsEatablished = PackGetInt(p, "NumConnectionsEatablished"); + s->NumConnectionsEstablished = PackGetInt(p, "NumConnectionsEstablished"); s->MaxTcpConnections = PackGetInt(p, "MaxTcpConnections"); s->NumTcpConnections = PackGetInt(p, "NumTcpConnections"); s->NumTcpConnectionsUpload = PackGetInt(p, "NumTcpConnectionsUpload"); s->NumTcpConnectionsDownload = PackGetInt(p, "NumTcpConnectionsDownload"); s->StartTime = PackGetInt64(p, "StartTime"); - s->FirstConnectionEstablisiedTime = PackGetInt64(p, "FirstConnectionEstablisiedTime"); + s->FirstConnectionEstablishedTime = PackGetInt64(p, "FirstConnectionEstablishedTime"); s->CurrentConnectionEstablishTime = PackGetInt64(p, "CurrentConnectionEstablishTime"); s->TotalSendSize = PackGetInt64(p, "TotalSendSize"); s->TotalRecvSize = PackGetInt64(p, "TotalRecvSize"); @@ -5073,7 +5073,7 @@ void OutRpcClientGetConnectionStatus(PACK *p, RPC_CLIENT_GET_CONNECTION_STATUS * PackAddInt(p, "ServerPort", c->ServerPort); PackAddInt(p, "ServerProductVer", c->ServerProductVer); PackAddInt(p, "ServerProductBuild", c->ServerProductBuild); - PackAddInt(p, "NumConnectionsEatablished", c->NumConnectionsEatablished); + PackAddInt(p, "NumConnectionsEstablished", c->NumConnectionsEstablished); PackAddInt(p, "HalfConnection", c->HalfConnection); PackAddInt(p, "QoS", c->QoS); PackAddInt(p, "MaxTcpConnections", c->MaxTcpConnections); @@ -5091,7 +5091,7 @@ void OutRpcClientGetConnectionStatus(PACK *p, RPC_CLIENT_GET_CONNECTION_STATUS * PackAddBool(p, "IsMonitorMode", c->IsMonitorMode); PackAddInt64(p, "StartTime", c->StartTime); - PackAddInt64(p, "FirstConnectionEstablisiedTime", c->FirstConnectionEstablisiedTime); + PackAddInt64(p, "FirstConnectionEstablishedTime", c->FirstConnectionEstablishedTime); PackAddInt64(p, "CurrentConnectionEstablishTime", c->CurrentConnectionEstablishTime); PackAddInt64(p, "TotalSendSize", c->TotalSendSize); PackAddInt64(p, "TotalRecvSize", c->TotalRecvSize); @@ -6088,9 +6088,9 @@ void CiGetSessionStatus(RPC_CLIENT_GET_CONNECTION_STATUS *st, SESSION *s) // Connection start time st->StartTime = TickToTime(s->CreatedTime); // Connection completion time of the first connection - st->FirstConnectionEstablisiedTime = TickToTime(s->FirstConnectionEstablisiedTime); + st->FirstConnectionEstablishedTime = TickToTime(s->FirstConnectionEstablishedTime); // Number of connections have been established so far - st->NumConnectionsEatablished = s->NumConnectionsEatablished; + st->NumConnectionsEstablished = s->NumConnectionsEstablished; } Unlock(s->lock); } diff --git a/src/Cedar/Client.h b/src/Cedar/Client.h index 9e2f2ffe..03715ea9 100644 --- a/src/Cedar/Client.h +++ b/src/Cedar/Client.h @@ -427,9 +427,9 @@ struct RPC_CLIENT_GET_CONNECTION_STATUS X *ServerX; // Server certificate X *ClientX; // Client certificate UINT64 StartTime; // Connection start time - UINT64 FirstConnectionEstablisiedTime; // Connection completion time of the first connection + UINT64 FirstConnectionEstablishedTime; // Connection completion time of the first connection UINT64 CurrentConnectionEstablishTime; // Connection completion time of this connection - UINT NumConnectionsEatablished; // Number of connections have been established so far + UINT NumConnectionsEstablished; // Number of connections have been established so far bool HalfConnection; // Half-connection bool QoS; // VoIP / QoS UINT MaxTcpConnections; // Maximum number of the TCP connections diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c index ba46b5d4..9e971e33 100644 --- a/src/Cedar/Command.c +++ b/src/Cedar/Command.c @@ -14421,8 +14421,8 @@ void CmdPrintStatusToListViewEx(CT *ct, RPC_CLIENT_GET_CONNECTION_STATUS *s, boo GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->StartTime), NULL); CtInsert(ct, _UU("CM_ST_START_TIME"), tmp); - GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablisiedTime), NULL); - CtInsert(ct, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablisiedTime == 0 ? _UU("CM_ST_NONE") : tmp); + GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablishedTime), NULL); + CtInsert(ct, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablishedTime == 0 ? _UU("CM_ST_NONE") : tmp); if (s->Connected) { @@ -14432,7 +14432,7 @@ void CmdPrintStatusToListViewEx(CT *ct, RPC_CLIENT_GET_CONNECTION_STATUS *s, boo if (server_mode == false) { - UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEatablished); + UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEstablished); CtInsert(ct, _UU("CM_ST_NUM_ESTABLISHED"), tmp); } diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h index 85ccc3de..a6253976 100644 --- a/src/Cedar/Hub.h +++ b/src/Cedar/Hub.h @@ -348,7 +348,7 @@ struct ACCESS UCHAR DstMacAddress[6]; // Destination MAC address UCHAR DstMacMask[6]; // Destination MAC address mask bool CheckTcpState; // The state of the TCP connection - bool Established; // Establieshed(TCP) + bool Established; // Established(TCP) UINT Delay; // Delay UINT Jitter; // Jitter UINT Loss; // Packet loss diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c index c661b563..0857a20c 100644 --- a/src/Cedar/Session.c +++ b/src/Cedar/Session.c @@ -212,11 +212,11 @@ void SessionMain(SESSION *s) s->NextConnectionTime = Tick64() + (UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000); } - s->NumConnectionsEatablished++; + s->NumConnectionsEstablished++; s->CurrentConnectionEstablishTime = Tick64(); - if (s->FirstConnectionEstablisiedTime == 0) + if (s->FirstConnectionEstablishedTime == 0) { - s->FirstConnectionEstablisiedTime = Tick64(); + s->FirstConnectionEstablishedTime = Tick64(); } if (s->ServerMode == false && s->Cedar->Client != NULL) diff --git a/src/Cedar/Session.h b/src/Cedar/Session.h index 4f833907..d437242f 100644 --- a/src/Cedar/Session.h +++ b/src/Cedar/Session.h @@ -265,9 +265,9 @@ struct SESSION UINT NumDisconnected; // Number of socket disconnection bool NoReconnectToSession; // Disable to reconnect to the session char UnderlayProtocol[64]; // Physical communication protocol - UINT64 FirstConnectionEstablisiedTime; // Connection completion time of the first connection + UINT64 FirstConnectionEstablishedTime; // Connection completion time of the first connection UINT64 CurrentConnectionEstablishTime; // Completion time of this connection - UINT NumConnectionsEatablished; // Number of connections established so far + UINT NumConnectionsEstablished; // Number of connections established so far UINT AdjustMss; // MSS adjustment value bool IsVPNClientAndVLAN_Win32; // Is the VPN Client session with a VLAN card (Win32)