diff --git a/ArqHelper.h b/ArqHelper.h index ec8ad26..37eea7c 100644 --- a/ArqHelper.h +++ b/ArqHelper.h @@ -692,9 +692,8 @@ public: { if(pSession->Reset()) { -#ifndef USE_EXTERNAL_GC ReleaseGCSession(); -#endif + if(!m_lsFreeSession.TryPut(pSession)) m_lsGCSession.PushBack(pSession); } @@ -717,12 +716,13 @@ public: ENSURE(m_lsGCSession.IsEmpty()); } +private: void ReleaseGCSession(BOOL bForce = FALSE) { ::ReleaseGCObj(m_lsGCSession, m_dwSessionLockTime, bForce); } - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) override + virtual BOOL OnReadyRead(PVOID pv, UINT events) override { if(events & _EPOLL_ALL_ERROR_EVENTS) diff --git a/HPSocket4C.cpp b/HPSocket4C.cpp index fb6b8af..1a430c9 100644 --- a/HPSocket4C.cpp +++ b/HPSocket4C.cpp @@ -1319,11 +1319,6 @@ HPSOCKET_API BOOL __HP_CALL HP_TcpAgent_SendSmallFile(HP_Agent pAgent, HP_CONNID /**********************************************************************************/ /***************************** TCP Agent 属性访问方法 *****************************/ -HPSOCKET_API void __HP_CALL HP_TcpAgent_SetSyncConnectTimeout(HP_TcpAgent pAgent, DWORD dwSyncConnectTimeout) -{ - C_HP_Object::ToSecond(pAgent)->SetSyncConnectTimeout(dwSyncConnectTimeout); -} - HPSOCKET_API void __HP_CALL HP_TcpAgent_SetSocketBufferSize(HP_TcpAgent pAgent, DWORD dwSocketBufferSize) { C_HP_Object::ToSecond(pAgent)->SetSocketBufferSize(dwSocketBufferSize); @@ -1344,11 +1339,6 @@ HPSOCKET_API void __HP_CALL HP_TcpAgent_SetNoDelay(HP_TcpAgent pAgent, BOOL bNoD C_HP_Object::ToSecond(pAgent)->SetNoDelay(bNoDelay); } -HPSOCKET_API DWORD __HP_CALL HP_TcpAgent_GetSyncConnectTimeout(HP_TcpAgent pAgent) -{ - return C_HP_Object::ToSecond(pAgent)->GetSyncConnectTimeout(); -} - HPSOCKET_API DWORD __HP_CALL HP_TcpAgent_GetSocketBufferSize(HP_TcpAgent pAgent) { return C_HP_Object::ToSecond(pAgent)->GetSocketBufferSize(); @@ -1526,11 +1516,6 @@ HPSOCKET_API BOOL __HP_CALL HP_TcpClient_SendSmallFile(HP_Client pClient, LPCTST /**********************************************************************************/ /***************************** TCP Client 属性访问方法 *****************************/ -HPSOCKET_API void __HP_CALL HP_TcpClient_SetSyncConnectTimeout(HP_TcpClient pClient, DWORD dwSyncConnectTimeout) -{ - C_HP_Object::ToSecond(pClient)->SetSyncConnectTimeout(dwSyncConnectTimeout); -} - HPSOCKET_API void __HP_CALL HP_TcpClient_SetSocketBufferSize(HP_TcpClient pClient, DWORD dwSocketBufferSize) { C_HP_Object::ToSecond(pClient)->SetSocketBufferSize(dwSocketBufferSize); @@ -1551,11 +1536,6 @@ HPSOCKET_API void __HP_CALL HP_TcpClient_SetNoDelay(HP_TcpClient pClient, BOOL b C_HP_Object::ToSecond(pClient)->SetNoDelay(bNoDelay); } -HPSOCKET_API DWORD __HP_CALL HP_TcpClient_GetSyncConnectTimeout(HP_TcpClient pClient) -{ - return C_HP_Object::ToSecond(pClient)->GetSyncConnectTimeout(); -} - HPSOCKET_API DWORD __HP_CALL HP_TcpClient_GetSocketBufferSize(HP_TcpClient pClient) { return C_HP_Object::ToSecond(pClient)->GetSocketBufferSize(); diff --git a/HPThreadPool.cpp b/HPThreadPool.cpp index 0cbed1a..fc0eb62 100644 --- a/HPThreadPool.cpp +++ b/HPThreadPool.cpp @@ -66,7 +66,7 @@ void DestroySocketTaskObj(LPTSocketTask pTask) } } -volatile UINT CHPThreadPool::sm_uiNum = MAXUINT; +volatile UINT CHPThreadPool::sm_uiNum = 0; LPCTSTR CHPThreadPool::POOLED_THREAD_PREFIX = _T("hp-pool-"); BOOL CHPThreadPool::Start(DWORD dwThreadCount, DWORD dwMaxQueueSize, EnRejectedPolicy enRejectedPolicy, DWORD dwStackSize) @@ -476,7 +476,7 @@ BOOL CHPThreadPool::CheckStoping() void CHPThreadPool::Reset(BOOL bSetWaitEvent) { - m_uiSeq = MAXUINT; + m_uiSeq = 0; m_dwStackSize = 0; m_dwTaskCount = 0; m_dwThreadCount = 0; diff --git a/HttpAgent.cpp b/HttpAgent.cpp index a3daf33..b3b93c3 100644 --- a/HttpAgent.cpp +++ b/HttpAgent.cpp @@ -197,15 +197,6 @@ template EnHandleResult CHttpAgentT void CHttpAgentT::ReleaseGCSocketObj(BOOL bForce) -{ - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_objPool.ReleaseGCHttpObj(bForce); -#endif -} - template BOOL CHttpAgentT::IsUpgrade(CONNID dwConnID) { THttpObj* pHttpObj = FindHttpObj(dwConnID); diff --git a/HttpAgent.h b/HttpAgent.h index ab79bca..29149e0 100644 --- a/HttpAgent.h +++ b/HttpAgent.h @@ -134,8 +134,6 @@ private: virtual EnHandleResult DoFireClose(TAgentSocketObj* pSocketObj, EnSocketOperation enOperation, int iErrorCode); virtual EnHandleResult DoFireShutdown(); - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - EnHandleResult DoFireSuperReceive(TAgentSocketObj* pSocketObj, const BYTE* pData, int iLength) {return __super::DoFireReceive(pSocketObj, pData, iLength);} diff --git a/HttpHelper.h b/HttpHelper.h index c4d375f..20f25d3 100644 --- a/HttpHelper.h +++ b/HttpHelper.h @@ -87,7 +87,7 @@ typedef llhttp_settings_t http_parser_settings; #define MIN_HTTP_RELEASE_CHECK_INTERVAL ((DWORD)1000) #define MIN_HTTP_RELEASE_DELAY 100 #define MAX_HTTP_RELEASE_DELAY (60 * 1000) -#define DEFAULT_HTTP_RELEASE_DELAY (5 * 1000) +#define DEFAULT_HTTP_RELEASE_DELAY (3 * 1000) #define DEFAULT_HTTP_VERSION HV_1_1 #define DEFAULT_HTTP_SYNC_CONNECT_TIMEOUT 5000 @@ -1302,9 +1302,8 @@ public: { pHttpObj->SetFree(); -#ifndef USE_EXTERNAL_GC ReleaseGCHttpObj(); -#endif + if(!m_lsFreeHttpObj.TryPut(pHttpObj)) m_lsGCHttpObj.PushBack(pHttpObj); } @@ -1322,6 +1321,7 @@ public: VERIFY(m_lsGCHttpObj.IsEmpty()); } +private: void ReleaseGCHttpObj(BOOL bForce = FALSE) { ::ReleaseGCObj(m_lsGCHttpObj, m_dwHttpObjLockTime, bForce); diff --git a/HttpServer.cpp b/HttpServer.cpp index 1f5cc4c..c3678ca 100644 --- a/HttpServer.cpp +++ b/HttpServer.cpp @@ -293,15 +293,6 @@ template EnHandleResult CHttpServerT void CHttpServerT::ReleaseGCSocketObj(BOOL bForce) -{ - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_objPool.ReleaseGCHttpObj(bForce); -#endif -} - template void CHttpServerT::WaitForCleanerThreadEnd() { if(m_thCleaner.IsRunning()) diff --git a/HttpServer.h b/HttpServer.h index 6decd32..51b6f71 100644 --- a/HttpServer.h +++ b/HttpServer.h @@ -128,8 +128,6 @@ private: virtual EnHandleResult DoFireClose(TSocketObj* pSocketObj, EnSocketOperation enOperation, int iErrorCode); virtual EnHandleResult DoFireShutdown(); - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - EnHandleResult DoFireSuperReceive(TSocketObj* pSocketObj, const BYTE* pData, int iLength) {return __super::DoFireReceive(pSocketObj, pData, iLength);} diff --git a/InternalDef.h b/InternalDef.h index ee4b4ca..bebe0d0 100644 --- a/InternalDef.h +++ b/InternalDef.h @@ -62,8 +62,6 @@ #define DEFAULT_CLIENT_FREE_BUFFER_POOL_SIZE 60 /* Client Ĭڴ黺ػշֵ */ #define DEFAULT_CLIENT_FREE_BUFFER_POOL_HOLD 60 -/* Client/Agent Ĭͬӳʱʱ */ -#define DEFAULT_SYNC_CONNECT_TIMEOUT 10000 /* IPv4 Ĭϰ󶨵ַ */ #define DEFAULT_IPV4_BIND_ADDRESS _T("0.0.0.0") /* IPv6 Ĭϰ󶨵ַ */ @@ -107,9 +105,6 @@ /* Ĭѹ/ѹݻ */ #define DEFAULT_COMPRESS_BUFFER_SIZE (16 * 1024) -/* ռ룩 */ -#define GC_CHECK_INTERVAL (15 * 1000) - #define HOST_SEPARATOR_CHAR '^' #define PORT_SEPARATOR_CHAR ':' #define IPV6_ADDR_BEGIN_CHAR '[' diff --git a/SSLAgent.cpp b/SSLAgent.cpp index 4b3dd7d..4ada974 100644 --- a/SSLAgent.cpp +++ b/SSLAgent.cpp @@ -66,15 +66,6 @@ void CSSLAgent::OnWorkerThreadEnd(THR_ID dwThreadID) __super::OnWorkerThreadEnd(dwThreadID); } -void CSSLAgent::ReleaseGCSocketObj(BOOL bForce) -{ - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_sslPool.ReleaseGCSession(bForce); -#endif -} - BOOL CSSLAgent::SendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount) { ASSERT(pBuffers && iCount > 0); diff --git a/SSLAgent.h b/SSLAgent.h index 901c9ba..c19675d 100644 --- a/SSLAgent.h +++ b/SSLAgent.h @@ -70,8 +70,6 @@ protected: virtual void OnWorkerThreadEnd(THR_ID dwThreadID); - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - protected: virtual BOOL StartSSLHandShake(TAgentSocketObj* pSocketObj); diff --git a/SSLHelper.cpp b/SSLHelper.cpp index 27be3a6..71e67c5 100644 --- a/SSLHelper.cpp +++ b/SSLHelper.cpp @@ -1168,9 +1168,8 @@ void CSSLSessionPool::PutFreeSession(CSSLSession* pSession) { if(pSession->Reset()) { -#ifndef USE_EXTERNAL_GC ReleaseGCSession(); -#endif + if(!m_lsFreeSession.TryPut(pSession)) m_lsGCSession.PushBack(pSession); } diff --git a/SSLHelper.h b/SSLHelper.h index ced52d4..9c5a688 100644 --- a/SSLHelper.h +++ b/SSLHelper.h @@ -336,6 +336,7 @@ public: void Prepare (); void Clear (); +private: void ReleaseGCSession (BOOL bForce = FALSE); public: diff --git a/SSLServer.cpp b/SSLServer.cpp index 66dbafc..210aa65 100644 --- a/SSLServer.cpp +++ b/SSLServer.cpp @@ -66,15 +66,6 @@ void CSSLServer::OnWorkerThreadEnd(THR_ID dwThreadID) __super::OnWorkerThreadEnd(dwThreadID); } -void CSSLServer::ReleaseGCSocketObj(BOOL bForce) -{ - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_sslPool.ReleaseGCSession(bForce); -#endif -} - BOOL CSSLServer::SendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount) { ASSERT(pBuffers && iCount > 0); diff --git a/SSLServer.h b/SSLServer.h index 70cb89b..fb4a86b 100644 --- a/SSLServer.h +++ b/SSLServer.h @@ -78,8 +78,6 @@ protected: virtual void OnWorkerThreadEnd(THR_ID dwThreadID); - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - protected: virtual BOOL StartSSLHandShake(TSocketObj* pSocketObj); diff --git a/SocketHelper.cpp b/SocketHelper.cpp index 05b16f4..6fd8e0d 100644 --- a/SocketHelper.cpp +++ b/SocketHelper.cpp @@ -53,7 +53,7 @@ BOOL SetCurrentWorkerThreadName() BOOL SetWorkerThreadDefaultName(THR_ID tid) { - static volatile UINT _s_uiSeq = MAXUINT; + static volatile UINT _s_uiSeq = 0; return ::SetSequenceThreadName(tid, DEFAULT_WORKER_THREAD_PREFIX, _s_uiSeq); } @@ -77,7 +77,6 @@ LPCTSTR GetSocketErrorDesc(EnSocketError enCode) case SE_NETWORK: return _T("Network Error"); case SE_DATA_PROC: return _T("Process Data Error"); case SE_DATA_SEND: return _T("Send Data Fail"); - case SE_GC_START: return _T("Start GC Fail"); case SE_SSL_ENV_NOT_READY: return _T("SSL environment not ready"); @@ -354,10 +353,10 @@ BOOL FreeHostIPAddresses(LPTIPAddr* lppIPAddr) BOOL sockaddr_IN_2_A(const HP_SOCKADDR& addr, ADDRESS_FAMILY& usFamily, LPTSTR lpszAddress, int& iAddressLen, USHORT& usPort) { - BOOL isOK = FALSE; + BOOL isOK = FALSE; - usFamily = addr.family; - usPort = addr.Port(); + usFamily = addr.family; + usPort = addr.Port(); if(::InetNtop(addr.family, addr.SinAddr(), lpszAddress, iAddressLen)) { @@ -447,36 +446,6 @@ BOOL SetMultiCastSocketOptions(SOCKET sock, const HP_SOCKADDR& bindAddr, const H return TRUE; } -int WaitForSocketWrite(SOCKET sock, DWORD dwTimeout) -{ - timeval tv = {(__time_t)(dwTimeout / 1000), (__suseconds_t)((dwTimeout % 1000) * 1000)}; - - fd_set wfds, efds; - FD_ZERO(&wfds); - FD_ZERO(&efds); - FD_SET(sock, &wfds); - FD_SET(sock, &efds); - - int rs = NO_EINTR_INT(select(sock + 1, nullptr, &wfds, &efds, &tv)); - - if(rs <= 0) return ((rs == 0) ? ERROR_TIMEOUT : ENSURE_ERROR(ERROR_CANT_WAIT)); - - if(FD_ISSET(sock, &efds)) - { - rs = SSO_GetError(sock); - return ((rs != NO_ERROR && rs != SOCKET_ERROR) ? rs : ENSURE_ERROR(ERROR_CANT_WAIT)); - } - - VERIFY(FD_ISSET(sock, &wfds)); - - rs = SSO_GetError(sock); - - if(!IS_NO_ERROR(rs)) - return ((rs != SOCKET_ERROR) ? rs : ENSURE_ERROR(ERROR_CANT_WAIT)); - - return NO_ERROR; -} - ULONGLONG NToH64(ULONGLONG value) { return (((ULONGLONG)ntohl((UINT)((value << 32) >> 32))) << 32) | ntohl((UINT)(value >> 32)); @@ -642,7 +611,7 @@ int SSO_ReuseAddress(SOCKET sock, EnReuseAddressPolicy opt) BOOL bReusePortSupported = #if defined(__linux) || defined(__linux__) - ::IsKernelVersionAbove(2, 6, 32); + ::IsKernelVersionAbove(3, 9, 0); #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__MACH__) TRUE; #else diff --git a/SocketHelper.h b/SocketHelper.h index 28e72bb..e047c22 100644 --- a/SocketHelper.h +++ b/SocketHelper.h @@ -303,14 +303,11 @@ public: DECLARE_NO_COPY_CLASS(TNodeBufferObj) }; +typedef CCASQueue CNodeRecvQueue; typedef TItemPtrT TNodeBufferObjPtr; typedef CNodePoolT CNodeBufferObjPool; -typedef CCASQueue CNodeRecvQueue; typedef TItemListExT TNodeBufferObjList; -typedef unique_ptr CNodeCriSecs; -typedef unique_ptr TNodeBufferObjLists; - /* Server 组件和 Agent 组件内部使用的事件处理结果常量 */ // 连接已关闭 @@ -323,7 +320,7 @@ enum EnDispCmdType DISP_CMD_RECEIVE = 0x02, // 接收数据 DISP_CMD_UNPAUSE = 0x03, // 恢复接收数据 DISP_CMD_DISCONNECT = 0x04, // 断开连接 - DISP_CMD_TIMEOUT = 0x05, // 保活超时 + DISP_CMD_TIMEOUT = 0x05 // 保活超时 }; /* 关闭连接标识 */ @@ -334,20 +331,14 @@ enum EnSocketCloseFlag SCF_ERROR = 2 // 触发 异常关闭 OnClose 事件 }; -/* 监听 Socket 数组智能指针 */ -typedef unique_ptr ListenSocketsPtr; - /* 数据缓冲节点 */ -typedef TItem TBufferObj; +typedef TItem TBufferObj; /* 数据缓冲节点智能指针 */ -typedef TItemPtr TBufferObjPtr; +typedef TItemPtr TBufferObjPtr; /* 数据缓冲区对象池 */ -typedef CItemPool CBufferObjPool; +typedef CItemPool CBufferObjPool; /* 数据缓冲区链表模板 */ -typedef TItemListExV TBufferObjList; - -/* 接收缓冲区数组智能指针 */ -typedef unique_ptr CReceiveBuffersPtr; +typedef TItemListExV TBufferObjList; /* 线程 ID - 接收缓冲区哈希表 */ typedef unordered_map TReceiveBufferMap; @@ -359,10 +350,7 @@ typedef TReceiveBufferMap::const_iterator TReceiveBufferMapCI; /* Socket 缓冲区基础结构 */ struct TSocketObjBase : public CSafeCounter { - CPrivateHeap& heap; - CReentrantCriSec csSend; - TBufferObjList sndBuff; - + CPrivateHeap& heap; CONNID connID; HP_SOCKADDR remoteAddr; @@ -381,7 +369,7 @@ struct TSocketObjBase : public CSafeCounter volatile BOOL connected; volatile BOOL paused; - TSocketObjBase(CPrivateHeap& hp, CBufferObjPool& bfPool) : heap(hp), sndBuff(bfPool) {} + TSocketObjBase(CPrivateHeap& hp) : heap(hp) {} static BOOL IsExist(TSocketObjBase* pSocketObj) {return pSocketObj != nullptr;} @@ -393,41 +381,13 @@ struct TSocketObjBase : public CSafeCounter {ASSERT(IsExist(pSocketObj)); pSocketObj->valid = FALSE;} static void Release(TSocketObjBase* pSocketObj) - { - ASSERT(IsExist(pSocketObj)); - - pSocketObj->freeTime = ::TimeGetTime(); - pSocketObj->sndBuff.Release(); - } - - static BOOL InvalidSocketObj(TSocketObjBase* pSocketObj) - { - BOOL bDone = FALSE; - - if(TSocketObjBase::IsValid(pSocketObj)) - { - pSocketObj->SetConnected(FALSE); - - CReentrantCriSecLock locallock(pSocketObj->csSend); - - if(TSocketObjBase::IsValid(pSocketObj)) - { - TSocketObjBase::Invalid(pSocketObj); - bDone = TRUE; - } - } - - return bDone; - } + {ASSERT(IsExist(pSocketObj)); pSocketObj->freeTime = ::TimeGetTime();} DWORD GetConnTime () const {return connTime;} DWORD GetFreeTime () const {return freeTime;} DWORD GetActiveTime () const {return activeTime;} BOOL IsPaused () const {return paused;} - int Pending () const {return sndBuff.Length();} - BOOL IsPending () const {return Pending() > 0;} - BOOL HasConnected() {return connected == TRUE;} BOOL IsConnecting() {return connected == CST_CONNECTING;} void SetConnected(BOOL bConnected = TRUE) {connected = bConnected;} @@ -451,7 +411,11 @@ struct TSocketObj : public TSocketObjBase { using __super = TSocketObjBase; - SOCKET socket; + CReentrantCriSec csIo; + CReentrantCriSec csSend; + + SOCKET socket; + TBufferObjList sndBuff; static TSocketObj* Construct(CPrivateHeap& hp, CBufferObjPool& bfPool) { @@ -471,11 +435,41 @@ struct TSocketObj : public TSocketObjBase } TSocketObj(CPrivateHeap& hp, CBufferObjPool& bfPool) - : __super(hp, bfPool) + : __super(hp), sndBuff(bfPool) { } + static void Release(TSocketObj* pSocketObj) + { + __super::Release(pSocketObj); + pSocketObj->sndBuff.Release(); + } + + int Pending() {return sndBuff.Length();} + BOOL IsPending() {return Pending() > 0;} + + static BOOL InvalidSocketObj(TSocketObj* pSocketObj) + { + BOOL bDone = FALSE; + + if(TSocketObjBase::IsValid(pSocketObj)) + { + pSocketObj->SetConnected(FALSE); + + CReentrantCriSecLock locallock(pSocketObj->csIo); + CReentrantCriSecLock locallock2(pSocketObj->csSend); + + if(TSocketObjBase::IsValid(pSocketObj)) + { + TSocketObjBase::Invalid(pSocketObj); + bDone = TRUE; + } + } + + return bDone; + } + void Reset(CONNID dwConnID, SOCKET soClient) { __super::Reset(dwConnID); @@ -535,13 +529,22 @@ struct TAgentSocketObj : public TSocketObj /* UDP 数据缓冲区结构 */ struct TUdpSocketObj : public TSocketObjBase { - using __super = TSocketObjBase; + using __super = TSocketObjBase; + using CRecvQueue = CCASQueue; - int index; - PVOID pHolder; - FD fdTimer; + PVOID pHolder; + FD fdTimer; - volatile DWORD detectFails; + CBufferObjPool& itPool; + + CRWLock lcIo; + CRWLock lcSend; + CCriSec csSend; + + TBufferObjList sndBuff; + CRecvQueue recvQueue; + + volatile DWORD detectFails; static TUdpSocketObj* Construct(CPrivateHeap& hp, CBufferObjPool& bfPool) { @@ -561,19 +564,67 @@ struct TUdpSocketObj : public TSocketObjBase } TUdpSocketObj(CPrivateHeap& hp, CBufferObjPool& bfPool) - : __super(hp, bfPool) + : __super(hp), sndBuff(bfPool), itPool(bfPool) { } + ~TUdpSocketObj() + { + ClearRecvQueue(); + } + + static void Release(TUdpSocketObj* pSocketObj) + { + __super::Release(pSocketObj); + + pSocketObj->ClearRecvQueue(); + pSocketObj->sndBuff.Release(); + } + + int Pending() {return sndBuff.Length();} + BOOL IsPending() {return Pending() > 0;} + BOOL HasRecvData() {return !recvQueue.IsEmpty();} + + static BOOL InvalidSocketObj(TUdpSocketObj* pSocketObj) + { + BOOL bDone = FALSE; + + if(TSocketObjBase::IsValid(pSocketObj)) + { + pSocketObj->SetConnected(FALSE); + + CReentrantWriteLock locallock(pSocketObj->lcIo); + CReentrantWriteLock locallock2(pSocketObj->lcSend); + CCriSecLock locallock3(pSocketObj->csSend); + + if(TSocketObjBase::IsValid(pSocketObj)) + { + TSocketObjBase::Invalid(pSocketObj); + bDone = TRUE; + } + } + + return bDone; + } + void Reset(CONNID dwConnID) { __super::Reset(dwConnID); - index = -1; - detectFails = 0; - fdTimer = INVALID_FD; pHolder = nullptr; + fdTimer = INVALID_FD; + detectFails = 0; + } + + void ClearRecvQueue() + { + TItem* pItem = nullptr; + + while(recvQueue.PopFront(&pItem)) + itPool.PutFreeItem(pItem); + + VERIFY(recvQueue.IsEmpty()); } }; @@ -696,8 +747,6 @@ BOOL GetSocketLocalAddress(SOCKET socket, LPTSTR lpszAddress, int& iAddressLen, BOOL GetSocketRemoteAddress(SOCKET socket, LPTSTR lpszAddress, int& iAddressLen, USHORT& usPort); /* 设置组播选项 */ BOOL SetMultiCastSocketOptions(SOCKET sock, const HP_SOCKADDR& bindAddr, const HP_SOCKADDR& castAddr, int iMCTtl, BOOL bMCLoop); -/* 等待连接 */ -int WaitForSocketWrite(SOCKET sock, DWORD dwTimeout); /* 64 位网络字节序转主机字节序 */ ULONGLONG NToH64(ULONGLONG value); diff --git a/TcpAgent.cpp b/TcpAgent.cpp index e5bc700..d26d4a8 100644 --- a/TcpAgent.cpp +++ b/TcpAgent.cpp @@ -56,7 +56,6 @@ BOOL CTcpAgent::CheckParams() { if ((m_enSendPolicy >= SP_PACK && m_enSendPolicy <= SP_DIRECT) && (m_enOnSendSyncPolicy >= OSSP_NONE && m_enOnSendSyncPolicy <= OSSP_RECEIVE) && - ((int)m_dwSyncConnectTimeout > 0) && ((int)m_dwMaxConnectionCount > 0 && m_dwMaxConnectionCount <= MAX_CONNECTION_COUNT) && ((int)m_dwWorkerThreadCount > 0 && m_dwWorkerThreadCount <= MAX_WORKER_THREAD_COUNT) && ((int)m_dwSocketBufferSize >= MIN_SOCKET_BUFFER_SIZE) && @@ -83,9 +82,6 @@ void CTcpAgent::PrepareStart() m_bfObjPool.SetPoolHold(m_dwFreeBufferObjHold); m_bfObjPool.Prepare(); - - m_rcBuffers = make_unique(m_dwWorkerThreadCount); - for_each(m_rcBuffers.get(), m_rcBuffers.get() + m_dwWorkerThreadCount, [this](CBufferPtr& buff) {buff.Malloc(m_dwSocketBufferSize);}); } BOOL CTcpAgent::CheckStarting() @@ -155,27 +151,13 @@ BOOL CTcpAgent::ParseBindAddress(LPCTSTR lpszBindAddress) BOOL CTcpAgent::CreateWorkerThreads() { - DWORD dwWorkerThreadCount = m_dwWorkerThreadCount -#ifdef USE_EXTERNAL_GC - + 1 -#endif - ; - - if(!m_ioDispatcher.Start(this, DEFAULT_WORKER_MAX_EVENT_COUNT, dwWorkerThreadCount)) - { - SetLastError(SE_WORKER_THREAD_CREATE, __FUNCTION__, ::WSAGetLastError()); + if(!m_ioDispatcher.Start(this, DEFAULT_WORKER_MAX_EVENT_COUNT, m_dwWorkerThreadCount)) return FALSE; - } -#ifdef USE_EXTERNAL_GC - m_fdGCTimer = m_ioDispatcher.AddTimer(m_dwWorkerThreadCount, GC_CHECK_INTERVAL, this); + const CIODispatcher::CWorkerThread* pWorkerThread = m_ioDispatcher.GetWorkerThreads(); - if(IS_INVALID_FD(m_fdGCTimer)) - { - SetLastError(SE_GC_START, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } -#endif + for(DWORD i = 0; i < m_dwWorkerThreadCount; i++) + m_rcBufferMap[pWorkerThread[i].GetThreadID()] = new CBufferPtr(m_dwSocketBufferSize); return TRUE; } @@ -235,14 +217,6 @@ void CTcpAgent::ReleaseFreeSocket() { m_lsFreeSocket.Clear(); -#ifdef USE_EXTERNAL_GC - if(IS_VALID_FD(m_fdGCTimer)) - { - close(m_fdGCTimer); - m_fdGCTimer = INVALID_FD; - } -#endif - ReleaseGCSocketObj(TRUE); VERIFY(m_lsGCSocket.IsEmpty()); } @@ -253,7 +227,7 @@ void CTcpAgent::Reset() m_phSocket.Reset(); m_soAddr.Reset(); - m_rcBuffers = nullptr; + ::ClearPtrMap(m_rcBufferMap); m_enState = SS_STOPPED; @@ -264,29 +238,34 @@ BOOL CTcpAgent::Connect(LPCTSTR lpszRemoteAddress, USHORT usPort, CONNID* pdwCon { ASSERT(lpszRemoteAddress && usPort != 0); - if(!HasStarted()) - { - ::SetLastError(ERROR_INVALID_STATE); - return FALSE; - } + DWORD result = NO_ERROR; + SOCKET soClient = INVALID_SOCKET; if(!pdwConnID) - pdwConnID = CreateLocalObject(CONNID); + pdwConnID = CreateLocalObject(CONNID); *pdwConnID = 0; HP_SOCKADDR addr; - HP_SCOPE_HOST host(lpszRemoteAddress); - SOCKET soClient = INVALID_SOCKET; - DWORD result = CreateClientSocket(host.addr, usPort, lpszLocalAddress, usLocalPort, soClient, addr); - - if(result == NO_ERROR) + if(!HasStarted()) + result = ERROR_INVALID_STATE; + else { - result = PrepareConnect(*pdwConnID, soClient); + HP_SCOPE_HOST host(lpszRemoteAddress); + + result = CreateClientSocket(host.addr, usPort, lpszLocalAddress, usLocalPort, soClient, addr); if(result == NO_ERROR) - result = ConnectToServer(*pdwConnID, host.name, soClient, addr, pExtra); + { + result = PrepareConnect(*pdwConnID, soClient); + + if(result == NO_ERROR) + { + result = ConnectToServer(*pdwConnID, host.name, soClient, addr, pExtra); + soClient = INVALID_SOCKET; + } + } } if(result != NO_ERROR) @@ -365,42 +344,44 @@ int CTcpAgent::PrepareConnect(CONNID& dwConnID, SOCKET soClient) return NO_ERROR; } -int CTcpAgent::ConnectToServer(CONNID dwConnID, LPCTSTR lpszRemoteHostName, SOCKET& soClient, const HP_SOCKADDR& addr, PVOID pExtra) +int CTcpAgent::ConnectToServer(CONNID dwConnID, LPCTSTR lpszRemoteHostName, SOCKET soClient, const HP_SOCKADDR& addr, PVOID pExtra) { TAgentSocketObj* pSocketObj = GetFreeSocketObj(dwConnID, soClient); + + CReentrantCriSecLock locallock(pSocketObj->csIo); + AddClientSocketObj(dwConnID, pSocketObj, addr, lpszRemoteHostName, pExtra); int result = HAS_ERROR; - VERIFY(::fcntl_SETFL(pSocketObj->socket, O_NOATIME | O_NONBLOCK | O_CLOEXEC)); - - int rc = ::connect(pSocketObj->socket, addr.Addr(), addr.AddrSize()); - - if(IS_NO_ERROR(rc) || IS_IO_PENDING_ERROR()) + if(m_bAsyncConnect) { - if(m_bAsyncConnect) + ::fcntl_SETFL(pSocketObj->socket, O_NOATIME | O_NONBLOCK | O_CLOEXEC); + + int rc = ::connect(pSocketObj->socket, addr.Addr(), addr.AddrSize()); + + if(IS_NO_ERROR(rc) || IS_IO_PENDING_ERROR()) { - if(m_ioDispatcher.AddFD(pSocketObj->socket, EPOLLOUT, pSocketObj)) + if(m_ioDispatcher.AddFD(pSocketObj->socket, EPOLLOUT | EPOLLONESHOT, pSocketObj)) result = NO_ERROR; } - else + } + else + { + if(::connect(pSocketObj->socket, addr.Addr(), addr.AddrSize()) != SOCKET_ERROR) { - if(IS_HAS_ERROR(result)) - result = ::WaitForSocketWrite(pSocketObj->socket, m_dwSyncConnectTimeout); + ::fcntl_SETFL(pSocketObj->socket, O_NOATIME | O_NONBLOCK | O_CLOEXEC); - if(IS_NO_ERROR(result)) + pSocketObj->SetConnected(); + + if(TRIGGER(FireConnect(pSocketObj)) == HR_ERROR) + result = ENSURE_ERROR_CANCELLED; + else { - pSocketObj->SetConnected(); + UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - if(TRIGGER(FireConnect(pSocketObj)) == HR_ERROR) - result = ENSURE_ERROR_CANCELLED; - else - { - UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - - if(!m_ioDispatcher.AddFD(pSocketObj->socket, evts | EPOLLRDHUP, pSocketObj)) - result = HAS_ERROR; - } + if(m_ioDispatcher.AddFD(pSocketObj->socket, evts | EPOLLRDHUP | EPOLLONESHOT, pSocketObj)) + result = NO_ERROR; } } } @@ -408,10 +389,7 @@ int CTcpAgent::ConnectToServer(CONNID dwConnID, LPCTSTR lpszRemoteHostName, SOCK if(result == HAS_ERROR) result = ::WSAGetLastError(); if(result != NO_ERROR) - { AddFreeSocketObj(pSocketObj, SCF_NONE); - soClient = INVALID_SOCKET; - } return result; } @@ -458,9 +436,7 @@ void CTcpAgent::AddFreeSocketObj(TAgentSocketObj* pSocketObj, EnSocketCloseFlag m_bfActiveSockets.Remove(pSocketObj->connID); TAgentSocketObj::Release(pSocketObj); -#ifndef USE_EXTERNAL_GC ReleaseGCSocketObj(); -#endif if(!m_lsFreeSocket.TryPut(pSocketObj)) m_lsGCSocket.PushBack(pSocketObj); @@ -810,7 +786,7 @@ BOOL CTcpAgent::Disconnect(CONNID dwConnID, BOOL bForce) return FALSE; } - return m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_DISCONNECT, dwConnID, bForce); + return m_ioDispatcher.SendCommand(DISP_CMD_DISCONNECT, dwConnID, bForce); } BOOL CTcpAgent::DisconnectLongConnections(DWORD dwPeriod, BOOL bForce) @@ -885,21 +861,13 @@ BOOL CTcpAgent::PauseReceive(CONNID dwConnID, BOOL bPause) pSocketObj->paused = bPause; if(!bPause) - return m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_UNPAUSE, pSocketObj->connID); + return m_ioDispatcher.SendCommand(DISP_CMD_UNPAUSE, pSocketObj->connID); return TRUE; } -BOOL CTcpAgent::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpAgent::OnBeforeProcessIo(PVOID pv, UINT events) { - if(pv == this) - { - ReleaseGCSocketObj(FALSE); - ::ReadTimer(m_fdGCTimer); - - return FALSE; - } - TAgentSocketObj* pSocketObj = (TAgentSocketObj*)(pv); if(!TAgentSocketObj::IsValid(pSocketObj)) @@ -909,25 +877,30 @@ BOOL CTcpAgent::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT e pSocketObj->SetConnected(FALSE); pSocketObj->Increment(); + pSocketObj->csIo.lock(); if(!TAgentSocketObj::IsValid(pSocketObj)) { + pSocketObj->csIo.unlock(); pSocketObj->Decrement(); + return FALSE; } if(pSocketObj->IsConnecting()) { - HandleConnect(pContext, pSocketObj, events); + HandleConnect(pSocketObj, events); + pSocketObj->csIo.unlock(); pSocketObj->Decrement(); + return FALSE; } return TRUE; } -VOID CTcpAgent::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) +VOID CTcpAgent::OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) { TAgentSocketObj* pSocketObj = (TAgentSocketObj*)(pv); @@ -936,37 +909,38 @@ VOID CTcpAgent::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT ev ASSERT(rs && !(events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP))); UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP, pSocketObj); + m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP | EPOLLONESHOT, pSocketObj); } + pSocketObj->csIo.unlock(); pSocketObj->Decrement(); } -VOID CTcpAgent::OnCommand(const TDispContext* pContext, TDispCommand* pCmd) +VOID CTcpAgent::OnCommand(TDispCommand* pCmd) { switch(pCmd->type) { case DISP_CMD_SEND: - HandleCmdSend(pContext, (CONNID)(pCmd->wParam)); + HandleCmdSend((CONNID)(pCmd->wParam)); break; case DISP_CMD_UNPAUSE: - HandleCmdUnpause(pContext, (CONNID)(pCmd->wParam)); + HandleCmdUnpause((CONNID)(pCmd->wParam)); break; case DISP_CMD_DISCONNECT: - HandleCmdDisconnect(pContext, (CONNID)(pCmd->wParam), (BOOL)pCmd->lParam); + HandleCmdDisconnect((CONNID)(pCmd->wParam), (BOOL)pCmd->lParam); break; } } -VOID CTcpAgent::HandleCmdSend(const TDispContext* pContext, CONNID dwConnID) +VOID CTcpAgent::HandleCmdSend(CONNID dwConnID) { TAgentSocketObj* pSocketObj = FindSocketObj(dwConnID); if(TAgentSocketObj::IsValid(pSocketObj) && pSocketObj->IsPending()) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLOUT); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLOUT); } -VOID CTcpAgent::HandleCmdUnpause(const TDispContext* pContext, CONNID dwConnID) +VOID CTcpAgent::HandleCmdUnpause(CONNID dwConnID) { TAgentSocketObj* pSocketObj = FindSocketObj(dwConnID); @@ -974,37 +948,37 @@ VOID CTcpAgent::HandleCmdUnpause(const TDispContext* pContext, CONNID dwConnID) return; if(BeforeUnpause(pSocketObj)) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLIN); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLIN); else AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_RECEIVE, ENSURE_ERROR_CANCELLED); } -VOID CTcpAgent::HandleCmdDisconnect(const TDispContext* pContext, CONNID dwConnID, BOOL bForce) +VOID CTcpAgent::HandleCmdDisconnect(CONNID dwConnID, BOOL bForce) { TAgentSocketObj* pSocketObj = FindSocketObj(dwConnID); if(TAgentSocketObj::IsValid(pSocketObj)) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLHUP); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLHUP); } -BOOL CTcpAgent::OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpAgent::OnReadyRead(PVOID pv, UINT events) { - return HandleReceive(pContext, (TAgentSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); + return HandleReceive((TAgentSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); } -BOOL CTcpAgent::OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpAgent::OnReadyWrite(PVOID pv, UINT events) { - return HandleSend(pContext, (TAgentSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); + return HandleSend((TAgentSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); } -BOOL CTcpAgent::OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpAgent::OnHungUp(PVOID pv, UINT events) { - return HandleClose(pContext, (TAgentSocketObj*)pv, SCF_CLOSE, events); + return HandleClose((TAgentSocketObj*)pv, SCF_CLOSE, events); } -BOOL CTcpAgent::OnError(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpAgent::OnError(PVOID pv, UINT events) { - return HandleClose(pContext, (TAgentSocketObj*)pv, SCF_ERROR, events); + return HandleClose((TAgentSocketObj*)pv, SCF_ERROR, events); } VOID CTcpAgent::OnDispatchThreadStart(THR_ID tid) @@ -1017,7 +991,7 @@ VOID CTcpAgent::OnDispatchThreadEnd(THR_ID tid) OnWorkerThreadEnd(tid); } -BOOL CTcpAgent::HandleClose(const TDispContext* pContext, TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events) +BOOL CTcpAgent::HandleClose(TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events) { EnSocketOperation enOperation = SO_CLOSE; @@ -1038,7 +1012,7 @@ BOOL CTcpAgent::HandleClose(const TDispContext* pContext, TAgentSocketObj* pSock return TRUE; } -BOOL CTcpAgent::HandleConnect(const TDispContext* pContext, TAgentSocketObj* pSocketObj, UINT events) +BOOL CTcpAgent::HandleConnect(TAgentSocketObj* pSocketObj, UINT events) { int code = ::SSO_GetError(pSocketObj->socket); @@ -1064,7 +1038,7 @@ BOOL CTcpAgent::HandleConnect(const TDispContext* pContext, TAgentSocketObj* pSo UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - if(!m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP, pSocketObj)) + if(!m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP | EPOLLONESHOT, pSocketObj)) { AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_CONNECT, ::WSAGetLastError()); return FALSE; @@ -1073,13 +1047,13 @@ BOOL CTcpAgent::HandleConnect(const TDispContext* pContext, TAgentSocketObj* pSo return TRUE; } -BOOL CTcpAgent::HandleReceive(const TDispContext* pContext, TAgentSocketObj* pSocketObj, int flag) +BOOL CTcpAgent::HandleReceive(TAgentSocketObj* pSocketObj, int flag) { ASSERT(TAgentSocketObj::IsValid(pSocketObj)); if(m_bMarkSilence) pSocketObj->activeTime = ::TimeGetTime(); - CBufferPtr& buffer = m_rcBuffers[pContext->GetIndex()]; + CBufferPtr& buffer = *(m_rcBufferMap[SELF_THREAD_ID]); int reads = flag ? -1 : MAX_CONTINUE_READS; @@ -1122,7 +1096,7 @@ BOOL CTcpAgent::HandleReceive(const TDispContext* pContext, TAgentSocketObj* pSo return TRUE; } -BOOL CTcpAgent::HandleSend(const TDispContext* pContext, TAgentSocketObj* pSocketObj, int flag) +BOOL CTcpAgent::HandleSend(TAgentSocketObj* pSocketObj, int flag) { ASSERT(TAgentSocketObj::IsValid(pSocketObj)); @@ -1263,7 +1237,7 @@ BOOL CTcpAgent::DoSendPackets(TAgentSocketObj* pSocketObj, const WSABUF pBuffers int CTcpAgent::SendInternal(TAgentSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount) { - BOOL bPending = pSocketObj->IsPending(); + int iPending = pSocketObj->Pending(); for(int i = 0; i < iCount; i++) { @@ -1279,9 +1253,9 @@ int CTcpAgent::SendInternal(TAgentSocketObj* pSocketObj, const WSABUF pBuffers[] } } - if(!bPending && pSocketObj->IsPending()) + if(iPending == 0 && pSocketObj->IsPending()) { - if(!m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_SEND, pSocketObj->connID)) + if(!m_ioDispatcher.SendCommand(DISP_CMD_SEND, pSocketObj->connID)) return ::GetLastError(); } diff --git a/TcpAgent.h b/TcpAgent.h index 5acbffc..cc05b85 100644 --- a/TcpAgent.h +++ b/TcpAgent.h @@ -74,15 +74,15 @@ protected: #endif private: - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) override; - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) override; - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnDispatchThreadStart(THR_ID tid) override; - virtual VOID OnDispatchThreadEnd(THR_ID tid) override; + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) override; + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) override; + virtual VOID OnCommand(TDispCommand* pCmd) override; + virtual BOOL OnReadyRead(PVOID pv, UINT events) override; + virtual BOOL OnReadyWrite(PVOID pv, UINT events) override; + virtual BOOL OnHungUp(PVOID pv, UINT events) override; + virtual BOOL OnError(PVOID pv, UINT events) override; + virtual VOID OnDispatchThreadStart(THR_ID tid) override; + virtual VOID OnDispatchThreadEnd(THR_ID tid) override; public: virtual BOOL IsSecure () {return FALSE;} @@ -91,9 +91,8 @@ public: virtual BOOL GetConnectionExtra(CONNID dwConnID, PVOID* ppExtra); virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy) {ENSURE_HAS_STOPPED(); m_enReusePolicy = enReusePolicy;} - virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enSendPolicy == enSendPolicy);} - virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enOnSendSyncPolicy == enOnSendSyncPolicy);} - virtual void SetSyncConnectTimeout (DWORD dwSyncConnectTimeout) {ENSURE_HAS_STOPPED(); m_dwSyncConnectTimeout = dwSyncConnectTimeout;} + virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); m_enSendPolicy = enSendPolicy;} + virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); m_enOnSendSyncPolicy = enOnSendSyncPolicy;} virtual void SetMaxConnectionCount (DWORD dwMaxConnectionCount) {ENSURE_HAS_STOPPED(); m_dwMaxConnectionCount = dwMaxConnectionCount;} virtual void SetWorkerThreadCount (DWORD dwWorkerThreadCount) {ENSURE_HAS_STOPPED(); m_dwWorkerThreadCount = dwWorkerThreadCount;} virtual void SetSocketBufferSize (DWORD dwSocketBufferSize) {ENSURE_HAS_STOPPED(); m_dwSocketBufferSize = dwSocketBufferSize;} @@ -110,7 +109,6 @@ public: virtual EnReuseAddressPolicy GetReuseAddressPolicy () {return m_enReusePolicy;} virtual EnSendPolicy GetSendPolicy () {return m_enSendPolicy;} virtual EnOnSendSyncPolicy GetOnSendSyncPolicy () {return m_enOnSendSyncPolicy;} - virtual DWORD GetSyncConnectTimeout () {return m_dwSyncConnectTimeout;} virtual DWORD GetMaxConnectionCount () {return m_dwMaxConnectionCount;} virtual DWORD GetWorkerThreadCount () {return m_dwWorkerThreadCount;} virtual DWORD GetSocketBufferSize () {return m_dwSocketBufferSize;} @@ -173,8 +171,6 @@ protected: virtual void OnWorkerThreadStart(THR_ID tid) {} virtual void OnWorkerThreadEnd(THR_ID tid) {} - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - BOOL DoSendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount); BOOL DoSendPackets(TAgentSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount); TAgentSocketObj* FindSocketObj(CONNID dwConnID); @@ -209,21 +205,22 @@ private: void AddFreeSocketObj (TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0); void DeleteSocketObj (TAgentSocketObj* pSocketObj); BOOL InvalidSocketObj (TAgentSocketObj* pSocketObj); + void ReleaseGCSocketObj (BOOL bForce = FALSE); void AddClientSocketObj (CONNID dwConnID, TAgentSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr, LPCTSTR lpszRemoteHostName, PVOID pExtra); void CloseClientSocketObj(TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0, int iShutdownFlag = SHUT_WR); private: int CreateClientSocket(LPCTSTR lpszRemoteAddress, USHORT usPort, LPCTSTR lpszLocalAddress, USHORT usLocalPort, SOCKET& soClient, HP_SOCKADDR& addr); int PrepareConnect (CONNID& dwConnID, SOCKET soClient); - int ConnectToServer (CONNID dwConnID, LPCTSTR lpszRemoteHostName, SOCKET& soClient, const HP_SOCKADDR& addr, PVOID pExtra); + int ConnectToServer (CONNID dwConnID, LPCTSTR lpszRemoteHostName, SOCKET soClient, const HP_SOCKADDR& addr, PVOID pExtra); - VOID HandleCmdSend (const TDispContext* pContext, CONNID dwConnID); - VOID HandleCmdUnpause (const TDispContext* pContext, CONNID dwConnID); - VOID HandleCmdDisconnect(const TDispContext* pContext, CONNID dwConnID, BOOL bForce); - BOOL HandleConnect (const TDispContext* pContext, TAgentSocketObj* pSocketObj, UINT events); - BOOL HandleReceive (const TDispContext* pContext, TAgentSocketObj* pSocketObj, int flag); - BOOL HandleSend (const TDispContext* pContext, TAgentSocketObj* pSocketObj, int flag); - BOOL HandleClose (const TDispContext* pContext, TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events); + VOID HandleCmdSend (CONNID dwConnID); + VOID HandleCmdUnpause (CONNID dwConnID); + VOID HandleCmdDisconnect(CONNID dwConnID, BOOL bForce); + BOOL HandleConnect (TAgentSocketObj* pSocketObj, UINT events); + BOOL HandleReceive (TAgentSocketObj* pSocketObj, int flag); + BOOL HandleSend (TAgentSocketObj* pSocketObj, int flag); + BOOL HandleClose (TAgentSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events); int SendInternal (TAgentSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount); BOOL SendItem (TAgentSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocked); @@ -233,12 +230,10 @@ public: : m_pListener (pListener) , m_enLastError (SE_OK) , m_enState (SS_STOPPED) - , m_fdGCTimer (INVALID_FD) , m_bAsyncConnect (TRUE) , m_enReusePolicy (RAP_ADDR_ONLY) , m_enSendPolicy (SP_PACK) - , m_enOnSendSyncPolicy (OSSP_RECEIVE) - , m_dwSyncConnectTimeout (DEFAULT_SYNC_CONNECT_TIMEOUT) + , m_enOnSendSyncPolicy (OSSP_NONE) , m_dwMaxConnectionCount (DEFAULT_CONNECTION_COUNT) , m_dwWorkerThreadCount (DEFAULT_WORKER_THREAD_COUNT) , m_dwSocketBufferSize (DEFAULT_TCP_SOCKET_BUFFER_SIZE) @@ -265,7 +260,6 @@ private: EnReuseAddressPolicy m_enReusePolicy; EnSendPolicy m_enSendPolicy; EnOnSendSyncPolicy m_enOnSendSyncPolicy; - DWORD m_dwSyncConnectTimeout; DWORD m_dwMaxConnectionCount; DWORD m_dwWorkerThreadCount; DWORD m_dwSocketBufferSize; @@ -288,19 +282,16 @@ private: EnSocketError m_enLastError; HP_SOCKADDR m_soAddr; - CReceiveBuffersPtr m_rcBuffers; - CPrivateHeap m_phSocket; CBufferObjPool m_bfObjPool; CSpinGuard m_csState; - FD m_fdGCTimer; - TAgentSocketObjPtrPool m_bfActiveSockets; TAgentSocketObjPtrList m_lsFreeSocket; TAgentSocketObjPtrQueue m_lsGCSocket; + TReceiveBufferMap m_rcBufferMap; CIODispatcher m_ioDispatcher; }; diff --git a/TcpClient.cpp b/TcpClient.cpp index c24edb6..69344e6 100644 --- a/TcpClient.cpp +++ b/TcpClient.cpp @@ -73,8 +73,7 @@ BOOL CTcpClient::Start(LPCTSTR lpszRemoteAddress, USHORT usPort, BOOL bAsyncConn BOOL CTcpClient::CheckParams() { - if (((int)m_dwSyncConnectTimeout > 0) && - ((int)m_dwSocketBufferSize > 0) && + if (((int)m_dwSocketBufferSize > 0) && ((int)m_dwFreeBufferPoolSize >= 0) && ((int)m_dwFreeBufferPoolHold >= 0) && ((int)m_dwKeepAliveTime >= 1000 || m_dwKeepAliveTime == 0) && @@ -187,36 +186,32 @@ BOOL CTcpClient::ConnectToServer(const HP_SOCKADDR& addrRemote, BOOL bAsyncConne { BOOL isOK = FALSE; - VERIFY(::fcntl_SETFL(m_soClient, O_NOATIME | O_NONBLOCK | O_CLOEXEC)); - - int rc = ::connect(m_soClient, addrRemote.Addr(), addrRemote.AddrSize()); - - if(IS_NO_ERROR(rc) || IS_IO_PENDING_ERROR()) + if(bAsyncConnect) { - if(bAsyncConnect) + VERIFY(::fcntl_SETFL(m_soClient, O_NOATIME | O_NONBLOCK | O_CLOEXEC)); + + int rc = ::connect(m_soClient, addrRemote.Addr(), addrRemote.AddrSize()); + + if(IS_NO_ERROR(rc) || IS_IO_PENDING_ERROR()) { m_nEvents = POLLOUT; isOK = TRUE; } - else + } + else + { + if(::connect(m_soClient, addrRemote.Addr(), addrRemote.AddrSize()) != SOCKET_ERROR) { - if(IS_HAS_ERROR(rc)) - rc = ::WaitForSocketWrite(m_soClient, m_dwSyncConnectTimeout); + VERIFY(::fcntl_SETFL(m_soClient, O_NOATIME | O_NONBLOCK | O_CLOEXEC)); - if(!IS_NO_ERROR(rc)) - ::WSASetLastError(rc); + SetConnected(); + + if(TRIGGER(FireConnect()) == HR_ERROR) + ::WSASetLastError(ENSURE_ERROR_CANCELLED); else { - SetConnected(); - - if(TRIGGER(FireConnect()) == HR_ERROR) - ::WSASetLastError(ENSURE_ERROR_CANCELLED); - else - { - m_nEvents = (SHORT)((m_lsSend.IsEmpty() ? 0 : POLLOUT) | (m_bPaused ? 0 : POLLIN) | POLLRDHUP); - isOK = TRUE; - } - + m_nEvents = (SHORT)((m_lsSend.IsEmpty() ? 0 : POLLOUT) | (m_bPaused ? 0 : POLLIN) | POLLRDHUP); + isOK = TRUE; } } } diff --git a/TcpClient.h b/TcpClient.h index bc19b15..403e18a 100644 --- a/TcpClient.h +++ b/TcpClient.h @@ -68,7 +68,6 @@ public: virtual BOOL IsSecure () {return FALSE;} virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy){ENSURE_HAS_STOPPED(); m_enReusePolicy = enReusePolicy;} - virtual void SetSyncConnectTimeout (DWORD dwSyncConnectTimeout) {ENSURE_HAS_STOPPED(); m_dwSyncConnectTimeout = dwSyncConnectTimeout;} virtual void SetSocketBufferSize (DWORD dwSocketBufferSize) {ENSURE_HAS_STOPPED(); m_dwSocketBufferSize = dwSocketBufferSize;} virtual void SetKeepAliveTime (DWORD dwKeepAliveTime) {ENSURE_HAS_STOPPED(); m_dwKeepAliveTime = dwKeepAliveTime;} virtual void SetKeepAliveInterval (DWORD dwKeepAliveInterval) {ENSURE_HAS_STOPPED(); m_dwKeepAliveInterval = dwKeepAliveInterval;} @@ -78,7 +77,6 @@ public: virtual void SetExtra (PVOID pExtra) {m_pExtra = pExtra;} virtual EnReuseAddressPolicy GetReuseAddressPolicy () {return m_enReusePolicy;} - virtual DWORD GetSyncConnectTimeout () {return m_dwSyncConnectTimeout;} virtual DWORD GetSocketBufferSize () {return m_dwSocketBufferSize;} virtual DWORD GetKeepAliveTime () {return m_dwKeepAliveTime;} virtual DWORD GetKeepAliveInterval () {return m_dwKeepAliveInterval;} @@ -183,7 +181,6 @@ public: , m_pExtra (nullptr) , m_pReserved (nullptr) , m_enReusePolicy (RAP_ADDR_ONLY) - , m_dwSyncConnectTimeout(DEFAULT_SYNC_CONNECT_TIMEOUT) , m_dwSocketBufferSize (DEFAULT_TCP_SOCKET_BUFFER_SIZE) , m_dwFreeBufferPoolSize(DEFAULT_CLIENT_FREE_BUFFER_POOL_SIZE) , m_dwFreeBufferPoolHold(DEFAULT_CLIENT_FREE_BUFFER_POOL_HOLD) @@ -209,7 +206,6 @@ private: CONNID m_dwConnID; EnReuseAddressPolicy m_enReusePolicy; - DWORD m_dwSyncConnectTimeout; DWORD m_dwSocketBufferSize; DWORD m_dwFreeBufferPoolSize; DWORD m_dwFreeBufferPoolHold; diff --git a/TcpPackAgent.h b/TcpPackAgent.h index ad36e91..5872c2c 100644 --- a/TcpPackAgent.h +++ b/TcpPackAgent.h @@ -114,6 +114,8 @@ protected: virtual BOOL BeforeUnpause(TAgentSocketObj* pSocketObj) { + CReentrantCriSecLock locallock(pSocketObj->csIo); + if(!TAgentSocketObj::IsValid(pSocketObj)) return FALSE; @@ -155,15 +157,6 @@ protected: m_bfPool.Prepare(); } - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE) - { - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_bfPool.ReleaseGCBuffer(bForce); -#endif - } - public: virtual void SetMaxPackSize (DWORD dwMaxPackSize) {ENSURE_HAS_STOPPED(); m_dwMaxPackSize = dwMaxPackSize;} virtual void SetPackHeaderFlag (USHORT usPackHeaderFlag) {ENSURE_HAS_STOPPED(); m_usHeaderFlag = usPackHeaderFlag;} diff --git a/TcpPackServer.h b/TcpPackServer.h index b7dd786..6b8c739 100644 --- a/TcpPackServer.h +++ b/TcpPackServer.h @@ -114,6 +114,8 @@ protected: virtual BOOL BeforeUnpause(TSocketObj* pSocketObj) { + CReentrantCriSecLock locallock(pSocketObj->csIo); + if(!TSocketObj::IsValid(pSocketObj)) return FALSE; @@ -155,15 +157,6 @@ protected: m_bfPool.Prepare(); } - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE) - { - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_bfPool.ReleaseGCBuffer(bForce); -#endif - } - public: virtual void SetMaxPackSize (DWORD dwMaxPackSize) {ENSURE_HAS_STOPPED(); m_dwMaxPackSize = dwMaxPackSize;} virtual void SetPackHeaderFlag (USHORT usPackHeaderFlag) {ENSURE_HAS_STOPPED(); m_usHeaderFlag = usPackHeaderFlag;} diff --git a/TcpPullAgent.h b/TcpPullAgent.h index 068a004..3d53a37 100644 --- a/TcpPullAgent.h +++ b/TcpPullAgent.h @@ -125,15 +125,6 @@ protected: m_bfPool.Prepare(); } - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE) - { - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_bfPool.ReleaseGCBuffer(bForce); -#endif - } - private: void ReleaseConnectionExtra(TAgentSocketObj* pSocketObj) { diff --git a/TcpPullServer.h b/TcpPullServer.h index 19213b9..b8b9011 100644 --- a/TcpPullServer.h +++ b/TcpPullServer.h @@ -125,15 +125,6 @@ protected: m_bfPool.Prepare(); } - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE) - { - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_bfPool.ReleaseGCBuffer(bForce); -#endif - } - private: void ReleaseConnectionExtra(TSocketObj* pSocketObj) { diff --git a/TcpServer.cpp b/TcpServer.cpp index b051cc0..2b81e70 100644 --- a/TcpServer.cpp +++ b/TcpServer.cpp @@ -83,12 +83,6 @@ void CTcpServer::PrepareStart() m_bfObjPool.SetPoolHold(m_dwFreeBufferObjHold); m_bfObjPool.Prepare(); - - m_rcBuffers = make_unique(m_dwWorkerThreadCount); - for_each(m_rcBuffers.get(), m_rcBuffers.get() + m_dwWorkerThreadCount, [this](CBufferPtr& buff) {buff.Malloc(m_dwSocketBufferSize);}); - - m_soListens = make_unique(m_dwWorkerThreadCount); - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) {sock = INVALID_FD;}); } BOOL CTcpServer::CheckStarting() @@ -126,98 +120,68 @@ BOOL CTcpServer::CheckStoping() BOOL CTcpServer::CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort) { + BOOL isOK = FALSE; + if(::IsStrEmpty(lpszBindAddress)) lpszBindAddress = DEFAULT_IPV4_BIND_ADDRESS; HP_SOCKADDR addr; - if(!::sockaddr_A_2_IN(lpszBindAddress, usPort, addr)) + if(::sockaddr_A_2_IN(lpszBindAddress, usPort, addr)) { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } + m_soListen = socket(addr.family, SOCK_STREAM, IPPROTO_TCP); - for(DWORD i = 0; i < m_dwWorkerThreadCount; i++) - { - m_soListens[i] = socket(addr.family, SOCK_STREAM, IPPROTO_TCP); - SOCKET soListen = m_soListens[i]; - - if(IS_INVALID_FD(soListen)) + if(m_soListen != INVALID_SOCKET) { + ::fcntl_SETFL(m_soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC); + + BOOL bOnOff = (m_dwKeepAliveTime > 0 && m_dwKeepAliveInterval > 0); + VERIFY(IS_NO_ERROR(::SSO_KeepAliveVals(m_soListen, bOnOff, m_dwKeepAliveTime, m_dwKeepAliveInterval))); + VERIFY(IS_NO_ERROR(::SSO_ReuseAddress(m_soListen, m_enReusePolicy))); + VERIFY(IS_NO_ERROR(::SSO_NoDelay(m_soListen, m_bNoDelay))); + + if(::bind(m_soListen, addr.Addr(), addr.AddrSize()) != SOCKET_ERROR) + { + if(TRIGGER(FirePrepareListen(m_soListen)) != HR_ERROR) + { + if(::listen(m_soListen, m_dwSocketListenQueue) != SOCKET_ERROR) + { + isOK = TRUE; + } + else + SetLastError(SE_SOCKET_LISTEN, __FUNCTION__, ::WSAGetLastError()); + } + else + SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); + } + else + SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); + } + else SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - - ::fcntl_SETFL(soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC); - - BOOL bOnOff = (m_dwKeepAliveTime > 0 && m_dwKeepAliveInterval > 0); - VERIFY(IS_NO_ERROR(::SSO_KeepAliveVals(soListen, bOnOff, m_dwKeepAliveTime, m_dwKeepAliveInterval))); - VERIFY(IS_NO_ERROR(::SSO_ReuseAddress(soListen, m_enReusePolicy))); - VERIFY(IS_NO_ERROR(::SSO_NoDelay(soListen, m_bNoDelay))); - - if(IS_HAS_ERROR(::bind(soListen, addr.Addr(), addr.AddrSize()))) - { - SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - - if(TRIGGER(FirePrepareListen(soListen)) == HR_ERROR) - { - SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); - return FALSE; - } - - if(IS_HAS_ERROR(::listen(soListen, m_dwSocketListenQueue))) - { - SetLastError(SE_SOCKET_LISTEN, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } } + else + SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return TRUE; + return isOK; } BOOL CTcpServer::CreateWorkerThreads() { - DWORD dwWorkerThreadCount = m_dwWorkerThreadCount -#ifdef USE_EXTERNAL_GC - + 1 -#endif - ; - - if(!m_ioDispatcher.Start(this, m_dwAcceptSocketCount, dwWorkerThreadCount)) - { - SetLastError(SE_WORKER_THREAD_CREATE, __FUNCTION__, ::WSAGetLastError()); + if(!m_ioDispatcher.Start(this, m_dwAcceptSocketCount, m_dwWorkerThreadCount)) return FALSE; - } + + const CIODispatcher::CWorkerThread* pWorkerThread = m_ioDispatcher.GetWorkerThreads(); + + for(DWORD i = 0; i < m_dwWorkerThreadCount; i++) + m_rcBufferMap[pWorkerThread[i].GetThreadID()] = new CBufferPtr(m_dwSocketBufferSize); return TRUE; } BOOL CTcpServer::StartAccept() { - for(int i = 0; i < (int)m_dwWorkerThreadCount; i++) - { - SOCKET& soListen = m_soListens[i]; - - if(!m_ioDispatcher.AddFD(i, soListen, EPOLLIN | EPOLLET, TO_PVOID(&soListen))) - { - SetLastError(SE_SOCKE_ATTACH_TO_CP, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - } - -#ifdef USE_EXTERNAL_GC - m_fdGCTimer = m_ioDispatcher.AddTimer(m_dwWorkerThreadCount, GC_CHECK_INTERVAL, this); - - if(IS_INVALID_FD(m_fdGCTimer)) - { - SetLastError(SE_GC_START, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } -#endif - - return TRUE; + return m_ioDispatcher.AddFD(m_soListen, _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); } BOOL CTcpServer::Stop() @@ -244,16 +208,10 @@ BOOL CTcpServer::Stop() void CTcpServer::CloseListenSocket() { - if(m_soListens) + if(m_soListen != INVALID_SOCKET) { - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) - { - if(sock != INVALID_FD) - { - ::ManualCloseSocket(sock); - sock = INVALID_FD; - } - }); + ::ManualCloseSocket(m_soListen); + m_soListen = INVALID_SOCKET; ::WaitFor(100); } @@ -292,14 +250,6 @@ void CTcpServer::ReleaseFreeSocket() { m_lsFreeSocket.Clear(); -#ifdef USE_EXTERNAL_GC - if(IS_VALID_FD(m_fdGCTimer)) - { - close(m_fdGCTimer); - m_fdGCTimer = INVALID_FD; - } -#endif - ReleaseGCSocketObj(TRUE); VERIFY(m_lsGCSocket.IsEmpty()); } @@ -309,8 +259,7 @@ void CTcpServer::Reset() m_phSocket.Reset(); m_bfObjPool.Clear(); - m_rcBuffers = nullptr; - m_soListens = nullptr; + ::ClearPtrMap(m_rcBufferMap); m_enState = SS_STOPPED; @@ -359,9 +308,7 @@ void CTcpServer::AddFreeSocketObj(TSocketObj* pSocketObj, EnSocketCloseFlag enFl m_bfActiveSockets.Remove(pSocketObj->connID); TSocketObj::Release(pSocketObj); -#ifndef USE_EXTERNAL_GC ReleaseGCSocketObj(); -#endif if(!m_lsFreeSocket.TryPut(pSocketObj)) m_lsGCSocket.PushBack(pSocketObj); @@ -419,13 +366,7 @@ BOOL CTcpServer::GetListenAddress(TCHAR lpszAddress[], int& iAddressLen, USHORT& { ASSERT(lpszAddress != nullptr && iAddressLen > 0); - if(!HasStarted()) - { - ::SetLastError(ERROR_INVALID_STATE); - return FALSE; - } - - return ::GetSocketLocalAddress(m_soListens[0], lpszAddress, iAddressLen, usPort); + return ::GetSocketLocalAddress(m_soListen, lpszAddress, iAddressLen, usPort); } BOOL CTcpServer::GetLocalAddress(CONNID dwConnID, TCHAR lpszAddress[], int& iAddressLen, USHORT& usPort) @@ -677,7 +618,7 @@ BOOL CTcpServer::Disconnect(CONNID dwConnID, BOOL bForce) return FALSE; } - return m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_DISCONNECT, dwConnID, bForce); + return m_ioDispatcher.SendCommand(DISP_CMD_DISCONNECT, dwConnID, bForce); } BOOL CTcpServer::DisconnectLongConnections(DWORD dwPeriod, BOOL bForce) @@ -746,23 +687,16 @@ BOOL CTcpServer::PauseReceive(CONNID dwConnID, BOOL bPause) pSocketObj->paused = bPause; if(!bPause) - return m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_UNPAUSE, pSocketObj->connID); + return m_ioDispatcher.SendCommand(DISP_CMD_UNPAUSE, pSocketObj->connID); return TRUE; } -BOOL CTcpServer::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpServer::OnBeforeProcessIo(PVOID pv, UINT events) { - if(pv == &m_soListens[pContext->GetIndex()]) + if(pv == &m_soListen) { - HandleAccept(pContext, events); - return FALSE; - } - else if(pv == this) - { - ReleaseGCSocketObj(FALSE); - ::ReadTimer(m_fdGCTimer); - + HandleAccept(events); return FALSE; } @@ -775,17 +709,20 @@ BOOL CTcpServer::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT pSocketObj->SetConnected(FALSE); pSocketObj->Increment(); + pSocketObj->csIo.lock(); if(!TSocketObj::IsValid(pSocketObj)) { + pSocketObj->csIo.unlock(); pSocketObj->Decrement(); + return FALSE; } return TRUE; } -VOID CTcpServer::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) +VOID CTcpServer::OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) { TSocketObj* pSocketObj = (TSocketObj*)(pv); @@ -794,37 +731,38 @@ VOID CTcpServer::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT e ASSERT(rs && !(events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP))); UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP, pSocketObj); + m_ioDispatcher.ModFD(pSocketObj->socket, evts | EPOLLRDHUP | EPOLLONESHOT, pSocketObj); } + pSocketObj->csIo.unlock(); pSocketObj->Decrement(); } -VOID CTcpServer::OnCommand(const TDispContext* pContext, TDispCommand* pCmd) +VOID CTcpServer::OnCommand(TDispCommand* pCmd) { switch(pCmd->type) { case DISP_CMD_SEND: - HandleCmdSend(pContext, (CONNID)(pCmd->wParam)); + HandleCmdSend((CONNID)(pCmd->wParam)); break; case DISP_CMD_UNPAUSE: - HandleCmdUnpause(pContext, (CONNID)(pCmd->wParam)); + HandleCmdUnpause((CONNID)(pCmd->wParam)); break; case DISP_CMD_DISCONNECT: - HandleCmdDisconnect(pContext, (CONNID)(pCmd->wParam), (BOOL)pCmd->lParam); + HandleCmdDisconnect((CONNID)(pCmd->wParam), (BOOL)pCmd->lParam); break; } } -VOID CTcpServer::HandleCmdSend(const TDispContext* pContext, CONNID dwConnID) +VOID CTcpServer::HandleCmdSend(CONNID dwConnID) { TSocketObj* pSocketObj = FindSocketObj(dwConnID); if(TSocketObj::IsValid(pSocketObj) && pSocketObj->IsPending()) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLOUT); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLOUT); } -VOID CTcpServer::HandleCmdUnpause(const TDispContext* pContext, CONNID dwConnID) +VOID CTcpServer::HandleCmdUnpause(CONNID dwConnID) { TSocketObj* pSocketObj = FindSocketObj(dwConnID); @@ -832,37 +770,37 @@ VOID CTcpServer::HandleCmdUnpause(const TDispContext* pContext, CONNID dwConnID) return; if(BeforeUnpause(pSocketObj)) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLIN); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLIN); else AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_RECEIVE, ENSURE_ERROR_CANCELLED); } -VOID CTcpServer::HandleCmdDisconnect(const TDispContext* pContext, CONNID dwConnID, BOOL bForce) +VOID CTcpServer::HandleCmdDisconnect(CONNID dwConnID, BOOL bForce) { TSocketObj* pSocketObj = FindSocketObj(dwConnID); if(TSocketObj::IsValid(pSocketObj)) - m_ioDispatcher.ProcessIo(pContext, pSocketObj, EPOLLHUP); + m_ioDispatcher.ProcessIo(pSocketObj, EPOLLHUP); } -BOOL CTcpServer::OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpServer::OnReadyRead(PVOID pv, UINT events) { - return HandleReceive(pContext, (TSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); + return HandleReceive((TSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); } -BOOL CTcpServer::OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpServer::OnReadyWrite(PVOID pv, UINT events) { - return HandleSend(pContext, (TSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); + return HandleSend((TSocketObj*)pv, RETRIVE_EVENT_FLAG_H(events)); } -BOOL CTcpServer::OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpServer::OnHungUp(PVOID pv, UINT events) { - return HandleClose(pContext, (TSocketObj*)pv, SCF_CLOSE, events); + return HandleClose((TSocketObj*)pv, SCF_CLOSE, events); } -BOOL CTcpServer::OnError(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CTcpServer::OnError(PVOID pv, UINT events) { - return HandleClose(pContext, (TSocketObj*)pv, SCF_ERROR, events); + return HandleClose((TSocketObj*)pv, SCF_ERROR, events); } VOID CTcpServer::OnDispatchThreadStart(THR_ID tid) @@ -875,7 +813,7 @@ VOID CTcpServer::OnDispatchThreadEnd(THR_ID tid) OnWorkerThreadEnd(tid); } -BOOL CTcpServer::HandleClose(const TDispContext* pContext, TSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events) +BOOL CTcpServer::HandleClose(TSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events) { EnSocketOperation enOperation = SO_CLOSE; @@ -896,7 +834,7 @@ BOOL CTcpServer::HandleClose(const TDispContext* pContext, TSocketObj* pSocketOb return TRUE; } -BOOL CTcpServer::HandleAccept(const TDispContext* pContext, UINT events) +BOOL CTcpServer::HandleAccept(UINT events) { if(events & _EPOLL_ALL_ERROR_EVENTS) { @@ -909,7 +847,7 @@ BOOL CTcpServer::HandleAccept(const TDispContext* pContext, UINT events) HP_SOCKADDR addr; socklen_t addrLen = (socklen_t)addr.AddrSize(); - SOCKET soClient = ::accept(m_soListens[pContext->GetIndex()], addr.Addr(), &addrLen); + SOCKET soClient = ::accept(m_soListen, addr.Addr(), &addrLen); if(soClient == INVALID_SOCKET) { @@ -950,7 +888,7 @@ BOOL CTcpServer::HandleAccept(const TDispContext* pContext, UINT events) UINT evts = (pSocketObj->IsPending() ? EPOLLOUT : 0) | (pSocketObj->IsPaused() ? 0 : EPOLLIN); - if(!m_ioDispatcher.AddFD(pSocketObj->socket, evts | EPOLLRDHUP, pSocketObj)) + if(!m_ioDispatcher.AddFD(pSocketObj->socket, evts | EPOLLRDHUP | EPOLLONESHOT, pSocketObj)) { AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_ACCEPT, ::WSAGetLastError()); continue; @@ -960,13 +898,13 @@ BOOL CTcpServer::HandleAccept(const TDispContext* pContext, UINT events) return TRUE; } -BOOL CTcpServer::HandleReceive(const TDispContext* pContext, TSocketObj* pSocketObj, int flag) +BOOL CTcpServer::HandleReceive(TSocketObj* pSocketObj, int flag) { ASSERT(TSocketObj::IsValid(pSocketObj)); if(m_bMarkSilence) pSocketObj->activeTime = ::TimeGetTime(); - CBufferPtr& buffer = m_rcBuffers[pContext->GetIndex()]; + CBufferPtr& buffer = *(m_rcBufferMap[SELF_THREAD_ID]); int reads = flag ? -1 : MAX_CONTINUE_READS; @@ -1009,7 +947,7 @@ BOOL CTcpServer::HandleReceive(const TDispContext* pContext, TSocketObj* pSocket return TRUE; } -BOOL CTcpServer::HandleSend(const TDispContext* pContext, TSocketObj* pSocketObj, int flag) +BOOL CTcpServer::HandleSend(TSocketObj* pSocketObj, int flag) { ASSERT(TSocketObj::IsValid(pSocketObj)); @@ -1144,7 +1082,7 @@ BOOL CTcpServer::DoSendPackets(TSocketObj* pSocketObj, const WSABUF pBuffers[], int CTcpServer::SendInternal(TSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount) { - BOOL bPending = pSocketObj->IsPending(); + int iPending = pSocketObj->Pending(); for(int i = 0; i < iCount; i++) { @@ -1160,9 +1098,9 @@ int CTcpServer::SendInternal(TSocketObj* pSocketObj, const WSABUF pBuffers[], in } } - if(!bPending && pSocketObj->IsPending()) + if(iPending == 0 && pSocketObj->IsPending()) { - if(!m_ioDispatcher.SendCommandByFD(pSocketObj->socket, DISP_CMD_SEND, pSocketObj->connID)) + if(!m_ioDispatcher.SendCommand(DISP_CMD_SEND, pSocketObj->connID)) return ::GetLastError(); } diff --git a/TcpServer.h b/TcpServer.h index a13f44f..f348018 100644 --- a/TcpServer.h +++ b/TcpServer.h @@ -76,15 +76,15 @@ protected: #endif private: - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) override; - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) override; - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnDispatchThreadStart(THR_ID tid) override; - virtual VOID OnDispatchThreadEnd(THR_ID tid) override; + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) override; + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) override; + virtual VOID OnCommand(TDispCommand* pCmd) override; + virtual BOOL OnReadyRead(PVOID pv, UINT events) override; + virtual BOOL OnReadyWrite(PVOID pv, UINT events) override; + virtual BOOL OnHungUp(PVOID pv, UINT events) override; + virtual BOOL OnError(PVOID pv, UINT events) override; + virtual VOID OnDispatchThreadStart(THR_ID tid) override; + virtual VOID OnDispatchThreadEnd(THR_ID tid) override; public: virtual BOOL IsSecure () {return FALSE;} @@ -92,9 +92,9 @@ public: virtual BOOL SetConnectionExtra(CONNID dwConnID, PVOID pExtra); virtual BOOL GetConnectionExtra(CONNID dwConnID, PVOID* ppExtra); - virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enReusePolicy == enReusePolicy);} - virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enSendPolicy == enSendPolicy);} - virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enOnSendSyncPolicy == enOnSendSyncPolicy);} + virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy) {ENSURE_HAS_STOPPED(); m_enReusePolicy = enReusePolicy;} + virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); m_enSendPolicy = enSendPolicy;} + virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); m_enOnSendSyncPolicy = enOnSendSyncPolicy;} virtual void SetMaxConnectionCount (DWORD dwMaxConnectionCount) {ENSURE_HAS_STOPPED(); m_dwMaxConnectionCount = dwMaxConnectionCount;} virtual void SetWorkerThreadCount (DWORD dwWorkerThreadCount) {ENSURE_HAS_STOPPED(); m_dwWorkerThreadCount = dwWorkerThreadCount;} virtual void SetSocketListenQueue (DWORD dwSocketListenQueue) {ENSURE_HAS_STOPPED(); m_dwSocketListenQueue = dwSocketListenQueue;} @@ -174,10 +174,8 @@ protected: virtual BOOL BeforeUnpause(TSocketObj* pSocketObj) {return TRUE;} - virtual void OnWorkerThreadStart(THR_ID tid) {} - virtual void OnWorkerThreadEnd(THR_ID tid) {} - - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); + virtual void OnWorkerThreadStart(THR_ID tid) {} + virtual void OnWorkerThreadEnd(THR_ID tid) {} BOOL DoSendPackets(CONNID dwConnID, const WSABUF pBuffers[], int iCount); BOOL DoSendPackets(TSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount); @@ -214,17 +212,18 @@ private: void AddFreeSocketObj (TSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0); void DeleteSocketObj (TSocketObj* pSocketObj); BOOL InvalidSocketObj (TSocketObj* pSocketObj); + void ReleaseGCSocketObj (BOOL bForce = FALSE); void AddClientSocketObj (CONNID dwConnID, TSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr); void CloseClientSocketObj(TSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0, int iShutdownFlag = SHUT_WR); private: - VOID HandleCmdSend (const TDispContext* pContext, CONNID dwConnID); - VOID HandleCmdUnpause (const TDispContext* pContext, CONNID dwConnID); - VOID HandleCmdDisconnect(const TDispContext* pContext, CONNID dwConnID, BOOL bForce); - BOOL HandleAccept (const TDispContext* pContext, UINT events); - BOOL HandleReceive (const TDispContext* pContext, TSocketObj* pSocketObj, int flag); - BOOL HandleSend (const TDispContext* pContext, TSocketObj* pSocketObj, int flag); - BOOL HandleClose (const TDispContext* pContext, TSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events); + VOID HandleCmdSend (CONNID dwConnID); + VOID HandleCmdUnpause (CONNID dwConnID); + VOID HandleCmdDisconnect(CONNID dwConnID, BOOL bForce); + BOOL HandleAccept (UINT events); + BOOL HandleReceive (TSocketObj* pSocketObj, int flag); + BOOL HandleSend (TSocketObj* pSocketObj, int flag); + BOOL HandleClose (TSocketObj* pSocketObj, EnSocketCloseFlag enFlag, UINT events); int SendInternal (TSocketObj* pSocketObj, const WSABUF pBuffers[], int iCount); BOOL SendItem (TSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocked); @@ -232,12 +231,12 @@ private: public: CTcpServer(ITcpServerListener* pListener) : m_pListener (pListener) + , m_soListen (INVALID_SOCKET) , m_enLastError (SE_OK) , m_enState (SS_STOPPED) - , m_fdGCTimer (INVALID_FD) - , m_enReusePolicy (RAP_ADDR_AND_PORT) + , m_enReusePolicy (RAP_ADDR_ONLY) , m_enSendPolicy (SP_PACK) - , m_enOnSendSyncPolicy (OSSP_RECEIVE) + , m_enOnSendSyncPolicy (OSSP_NONE) , m_dwMaxConnectionCount (DEFAULT_CONNECTION_COUNT) , m_dwWorkerThreadCount (DEFAULT_WORKER_THREAD_COUNT) , m_dwSocketListenQueue (DEFAULT_TCP_SERVER_SOCKET_LISTEN_QUEUE) @@ -284,23 +283,20 @@ private: CSEM m_evWait; ITcpServerListener* m_pListener; - ListenSocketsPtr m_soListens; + SOCKET m_soListen; EnServiceState m_enState; EnSocketError m_enLastError; - CReceiveBuffersPtr m_rcBuffers; - CPrivateHeap m_phSocket; CBufferObjPool m_bfObjPool; CSpinGuard m_csState; - FD m_fdGCTimer; - TSocketObjPtrPool m_bfActiveSockets; TSocketObjPtrList m_lsFreeSocket; TSocketObjPtrQueue m_lsGCSocket; + TReceiveBufferMap m_rcBufferMap; CIODispatcher m_ioDispatcher; }; diff --git a/UdpArqServer.cpp b/UdpArqServer.cpp index 6eac8d4..0da419c 100644 --- a/UdpArqServer.cpp +++ b/UdpArqServer.cpp @@ -73,15 +73,6 @@ void CUdpArqServer::OnWorkerThreadStart(THR_ID dwThreadID) ::WaitFor(3); } -void CUdpArqServer::ReleaseGCSocketObj(BOOL bForce) -{ - __super::ReleaseGCSocketObj(bForce); - -#ifdef USE_EXTERNAL_GC - m_ssPool.ReleaseGCSession(bForce); -#endif -} - BOOL CUdpArqServer::Send(CONNID dwConnID, const BYTE* pBuffer, int iLength, int iOffset) { ASSERT(pBuffer && iLength > 0 && iLength <= (int)m_arqAttr.dwMaxMessageSize); diff --git a/UdpArqServer.h b/UdpArqServer.h index 2572606..53c9b9b 100644 --- a/UdpArqServer.h +++ b/UdpArqServer.h @@ -55,8 +55,6 @@ protected: virtual void Reset(); virtual void OnWorkerThreadStart(THR_ID dwThreadID); - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); - public: virtual void SetNoDelay (BOOL bNoDelay) {ENSURE_HAS_STOPPED(); m_arqAttr.bNoDelay = bNoDelay;} virtual void SetTurnoffCongestCtrl (BOOL bTurnOff) {ENSURE_HAS_STOPPED(); m_arqAttr.bTurnoffNc = bTurnOff;} diff --git a/UdpNode.cpp b/UdpNode.cpp index d7b3732..006104a 100644 --- a/UdpNode.cpp +++ b/UdpNode.cpp @@ -24,7 +24,7 @@ #if defined(__GNUC__) && __GNUC__ >= 11 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" -#pragma GCC diagnostic ignored "-Wstringop-overflow" +#pragma GCC diagnostic ignored "-Wstringop-overflow" #endif #include "UdpNode.h" @@ -40,16 +40,13 @@ BOOL CUdpNode::Start(LPCTSTR lpszBindAddress, USHORT usPort, EnCastMode enCastMo PrepareStart(); - HP_SOCKADDR bindAddr(AF_UNSPEC, TRUE); - - if(ParseBindAddr(lpszBindAddress, usPort, lpszCastAddress, bindAddr)) - if(CreateListenSocket(bindAddr)) - if(CreateWorkerThreads()) - if(StartAccept()) - { - m_enState = SS_STARTED; - return TRUE; - } + if(CreateListenSocket(lpszBindAddress, usPort, lpszCastAddress)) + if(CreateWorkerThreads()) + if(StartAccept()) + { + m_enState = SS_STARTED; + return TRUE; + } EXECUTE_RESTORE_ERROR(Stop()); @@ -74,7 +71,7 @@ BOOL CUdpNode::CheckParams() BOOL CUdpNode::CheckStarting() { - CReentrantWriteLock locallock(m_lcState); + CSpinLock locallock(m_csState); if(m_enState == SS_STOPPED) m_enState = SS_STARTING; @@ -94,24 +91,39 @@ void CUdpNode::PrepareStart() m_bfObjPool.SetPoolHold(m_dwFreeBufferPoolHold); m_bfObjPool.Prepare(); - - TNodeBufferObjList* pBufferObjList = (TNodeBufferObjList*)malloc(m_dwWorkerThreadCount * sizeof(TNodeBufferObjList)); - - for(int i = 0; i < (int)m_dwWorkerThreadCount; i++) - new (pBufferObjList + i) TNodeBufferObjList(m_bfObjPool); - - m_sndBuffs.reset(pBufferObjList); - - m_csSends = make_unique(m_dwWorkerThreadCount); - - m_rcBuffers = make_unique(m_dwWorkerThreadCount); - for_each(m_rcBuffers.get(), m_rcBuffers.get() + m_dwWorkerThreadCount, [this](CBufferPtr& buff) {buff.Malloc(m_dwMaxDatagramSize);}); - - m_soListens = make_unique(m_dwWorkerThreadCount); - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) {sock = INVALID_FD;}); } -BOOL CUdpNode::ParseBindAddr(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress, HP_SOCKADDR& bindAddr) +BOOL CUdpNode::CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress) +{ + HP_SOCKADDR bindAddr(AF_UNSPEC, TRUE); + + if(CreateListenSocket(lpszBindAddress, usPort, lpszCastAddress, bindAddr)) + { + if(BindListenSocket(bindAddr)) + { + if(TRIGGER(FirePrepareListen(m_soListen)) != HR_ERROR) + { + if(ConnectToGroup(bindAddr)) + { + return TRUE; + } + else + SetLastError(SE_CONNECT_SERVER, __FUNCTION__, ::WSAGetLastError()); + } + else + SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); + } + else + SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); + } + else + SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); + + return FALSE; +} + + +BOOL CUdpNode::CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress, HP_SOCKADDR& bindAddr) { if(::IsStrEmpty(lpszCastAddress)) { @@ -119,16 +131,13 @@ BOOL CUdpNode::ParseBindAddr(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lps lpszCastAddress = DEFAULT_IPV4_BROAD_CAST_ADDRESS; else if(m_enCastMode == CM_MULTICAST) { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ERROR_ADDRNOTAVAIL); + ::WSASetLastError(ERROR_ADDRNOTAVAIL); return FALSE; } } if(m_enCastMode != CM_UNICAST && !::sockaddr_A_2_IN(lpszCastAddress, usPort, m_castAddr)) - { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); return FALSE; - } if(::IsStrEmpty(lpszBindAddress)) { @@ -138,80 +147,58 @@ BOOL CUdpNode::ParseBindAddr(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lps else { if(!::sockaddr_A_2_IN(lpszBindAddress, usPort, bindAddr)) - { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); return FALSE; - } } if(m_enCastMode == CM_BROADCAST && bindAddr.IsIPv6()) { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ERROR_PFNOSUPPORT); + ::WSASetLastError(ERROR_PFNOSUPPORT); return FALSE; } if(m_enCastMode != CM_UNICAST && m_castAddr.family != bindAddr.family) { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ERROR_AFNOSUPPORT); + ::WSASetLastError(ERROR_AFNOSUPPORT); return FALSE; } + m_soListen = socket(bindAddr.family, SOCK_DGRAM, IPPROTO_UDP); + + if(m_soListen == INVALID_SOCKET) + return FALSE; + + VERIFY(::fcntl_SETFL(m_soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC)); + VERIFY(::SSO_ReuseAddress(m_soListen, m_enReusePolicy) == NO_ERROR); + return TRUE; } -BOOL CUdpNode::CreateListenSocket(const HP_SOCKADDR& bindAddr) +BOOL CUdpNode::BindListenSocket(HP_SOCKADDR& bindAddr) { - for(DWORD i = 0; i < m_dwWorkerThreadCount; i++) + if(::bind(m_soListen, bindAddr.Addr(), bindAddr.AddrSize()) == SOCKET_ERROR) + return FALSE; + + socklen_t dwAddrLen = (socklen_t)bindAddr.AddrSize(); + ENSURE(::getsockname(m_soListen, m_localAddr.Addr(), &dwAddrLen) != SOCKET_ERROR); + + return TRUE; +} + +BOOL CUdpNode::ConnectToGroup(const HP_SOCKADDR& bindAddr) +{ + if(m_enCastMode == CM_UNICAST) + return TRUE; + else if(m_enCastMode == CM_MULTICAST) { - m_soListens[i] = socket(bindAddr.family, SOCK_DGRAM, IPPROTO_UDP); - SOCKET soListen = m_soListens[i]; - - if(IS_INVALID_FD(soListen)) - { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); + if(!::SetMultiCastSocketOptions(m_soListen, bindAddr, m_castAddr, m_iMCTtl, m_bMCLoop)) return FALSE; - } + } + else + { + ASSERT(m_castAddr.IsIPv4()); - ::fcntl_SETFL(soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC); - VERIFY(IS_NO_ERROR(::SSO_ReuseAddress(soListen, m_enReusePolicy))); - - if(IS_HAS_ERROR(::bind(soListen, bindAddr.Addr(), bindAddr.AddrSize()))) - { - SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - - if(i == 0) - { - socklen_t dwAddrLen = (socklen_t)bindAddr.AddrSize(); - ENSURE(IS_NO_ERROR(::getsockname(soListen, m_localAddr.Addr(), &dwAddrLen))); - } - - if(m_enCastMode == CM_MULTICAST) - { - if(!::SetMultiCastSocketOptions(soListen, bindAddr, m_castAddr, m_iMCTtl, m_bMCLoop)) - { - SetLastError(SE_CONNECT_SERVER, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - } - else if(m_enCastMode == CM_BROADCAST) - { - ASSERT(m_castAddr.IsIPv4()); - - BOOL bSet = TRUE; - if(IS_HAS_ERROR(::SSO_SetSocketOption(soListen, SOL_SOCKET, SO_BROADCAST, &bSet, sizeof(BOOL)))) - { - SetLastError(SE_CONNECT_SERVER, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - } - - if(TRIGGER(FirePrepareListen(soListen)) == HR_ERROR) - { - SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); - return FALSE; - } + BOOL bSet = TRUE; + ENSURE(::SSO_SetSocketOption(m_soListen, SOL_SOCKET, SO_BROADCAST, &bSet, sizeof(BOOL)) != SOCKET_ERROR); } return TRUE; @@ -224,15 +211,7 @@ BOOL CUdpNode::CreateWorkerThreads() BOOL CUdpNode::StartAccept() { - for(int i = 0; i < (int)m_dwWorkerThreadCount; i++) - { - SOCKET& soListen = m_soListens[i]; - - if(!m_ioDispatcher.AddFD(i, soListen, EPOLLIN | EPOLLOUT | EPOLLET, TO_PVOID(&soListen))) - return FALSE; - } - - return TRUE; + return m_ioDispatcher.AddFD(m_soListen, _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); } BOOL CUdpNode::Stop() @@ -257,7 +236,7 @@ BOOL CUdpNode::CheckStoping() { if(m_enState != SS_STOPPED) { - CReentrantWriteLock locallock(m_lcState); + CSpinLock locallock(m_csState); if(HasStarted()) { @@ -273,19 +252,13 @@ BOOL CUdpNode::CheckStoping() void CUdpNode::CloseListenSocket() { - if(m_soListens) - { - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) - { - if(sock != INVALID_FD) - { - ::ManualCloseSocket(sock); - sock = INVALID_FD; - } - }); + if(m_soListen == INVALID_SOCKET) + return; - ::WaitFor(100); - } + ::ManualCloseSocket(m_soListen); + m_soListen = INVALID_SOCKET; + + ::WaitFor(100); } void CUdpNode::WaitForWorkerThreadEnd() @@ -295,16 +268,14 @@ void CUdpNode::WaitForWorkerThreadEnd() void CUdpNode::ReleaseFreeBuffer() { - for_each(m_sndBuffs.get(), m_sndBuffs.get() + m_dwWorkerThreadCount, [](TNodeBufferObjList& sndBuff) - { - sndBuff.Clear(); - sndBuff.~TNodeBufferObjList(); - }); + TNodeBufferObj* pBufferObj = nullptr; - free(m_sndBuffs.release()); + while(m_recvQueue.PopFront(&pBufferObj)) + m_bfObjPool.PutFreeItem(pBufferObj); - m_csSends = nullptr; + VERIFY(m_recvQueue.IsEmpty()); + m_sndBuff.Clear(); m_bfObjPool.Clear(); } @@ -313,20 +284,12 @@ void CUdpNode::Reset() m_castAddr.Reset(); m_localAddr.Reset(); - m_soListens = nullptr; - m_rcBuffers = nullptr; - m_iSending = 0; m_enState = SS_STOPPED; m_evWait.SyncNotifyAll(); } -int CUdpNode::GenerateBufferIndex(const HP_SOCKADDR& addrRemote) -{ - return (int)(addrRemote.Hash() % m_dwWorkerThreadCount); -} - BOOL CUdpNode::Send(LPCTSTR lpszRemoteAddress, USHORT usRemotePort, const BYTE* pBuffer, int iLength, int iOffset) { HP_SOCKADDR addrRemote; @@ -351,6 +314,7 @@ BOOL CUdpNode::SendCast(const BYTE* pBuffer, int iLength, int iOffset) { if(m_enCastMode == CM_UNICAST) { + ::SetLastError(ERROR_INVALID_OPERATION); return FALSE; } @@ -362,14 +326,14 @@ BOOL CUdpNode::SendCastPackets(const WSABUF pBuffers[], int iCount) { if(m_enCastMode == CM_UNICAST) { - ::SetLastError(ERROR_INVALID_OPERATION); + ::SetLastError(ERROR_INCORRECT_ADDRESS); return FALSE; } return DoSendPackets(m_castAddr, pBuffers, iCount); } -BOOL CUdpNode::DoSend(const HP_SOCKADDR& addrRemote, const BYTE* pBuffer, int iLength, int iOffset) +BOOL CUdpNode::DoSend(HP_SOCKADDR& addrRemote, const BYTE* pBuffer, int iLength, int iOffset) { ASSERT(pBuffer && iLength >= 0 && iLength <= (int)m_dwMaxDatagramSize); @@ -403,7 +367,7 @@ BOOL CUdpNode::DoSend(const HP_SOCKADDR& addrRemote, const BYTE* pBuffer, int iL return (result == NO_ERROR); } -BOOL CUdpNode::DoSendPackets(const HP_SOCKADDR& addrRemote, const WSABUF pBuffers[], int iCount) +BOOL CUdpNode::DoSendPackets(HP_SOCKADDR& addrRemote, const WSABUF pBuffers[], int iCount) { ASSERT(pBuffers && iCount > 0); @@ -457,81 +421,77 @@ BOOL CUdpNode::DoSendPackets(const HP_SOCKADDR& addrRemote, const WSABUF pBuffer return (result == NO_ERROR); } -int CUdpNode::SendInternal(const HP_SOCKADDR& addrRemote, TNodeBufferObjPtr& bufPtr) +int CUdpNode::SendInternal(HP_SOCKADDR& addrRemote, TNodeBufferObjPtr& bufPtr) { - BOOL bPending; - int iBufferSize = bufPtr->Size(); - int idx = GenerateBufferIndex(addrRemote); - addrRemote.Copy(bufPtr->remoteAddr); + BOOL bPending; + int iBufferSize; + { - CReentrantReadLock locallock(m_lcState); + CSpinLock locallock(m_csState); if(!IsValid()) return ERROR_INVALID_STATE; - TNodeBufferObjList& sndBuff = m_sndBuffs[idx]; + bPending = IsPending(); + iBufferSize = bufPtr->Size(); - CCriSecLock locallock2(m_csSends[idx]); + m_sndBuff.PushBack(bufPtr.Detach()); + if(iBufferSize == 0) m_sndBuff.IncreaseLength(1); - bPending = IsPending(idx); - sndBuff.PushBack(bufPtr.Detach()); - - if(iBufferSize == 0) sndBuff.IncreaseLength(1); - - ASSERT(sndBuff.Length() > 0); + ASSERT(m_sndBuff.Length() > 0); } - if(!bPending && IsPending(idx)) - VERIFY(m_ioDispatcher.SendCommandByIndex(idx, DISP_CMD_SEND)); + if(!bPending && IsPending()) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND)); return NO_ERROR; } -BOOL CUdpNode::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpNode::OnBeforeProcessIo(PVOID pv, UINT events) { - ASSERT(pv == &m_soListens[pContext->GetIndex()]); + ASSERT(pv == &m_soListen); return TRUE; } -VOID CUdpNode::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) +VOID CUdpNode::OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) { } -VOID CUdpNode::OnCommand(const TDispContext* pContext, TDispCommand* pCmd) +VOID CUdpNode::OnCommand(TDispCommand* pCmd) { - int idx = pContext->GetIndex(); - int flag = (int)(pCmd->wParam); - switch(pCmd->type) { case DISP_CMD_SEND: - HandleCmdSend(idx, flag); + HandleCmdSend((int)(pCmd->wParam)); + break; + case DISP_CMD_RECEIVE: + HandleCmdReceive((int)(pCmd->wParam)); break; } } -BOOL CUdpNode::OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpNode::OnReadyRead(PVOID pv, UINT events) { - return HandleReceive(pContext, RETRIVE_EVENT_FLAG_H(events)); + return HandleReceive(RETRIVE_EVENT_FLAG_H(events)); } -BOOL CUdpNode::OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpNode::OnReadyWrite(PVOID pv, UINT events) { - return HandleSend(pContext, RETRIVE_EVENT_FLAG_H(events), RETRIVE_EVENT_FLAG_R(events)); + return HandleSend(RETRIVE_EVENT_FLAG_H(events), RETRIVE_EVENT_FLAG_R(events)); } -BOOL CUdpNode::OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpNode::OnHungUp(PVOID pv, UINT events) { - return HandleClose(pContext->GetIndex(), nullptr, SO_CLOSE, 0); + return HandleClose(nullptr, SO_CLOSE, 0); } -BOOL CUdpNode::OnError(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpNode::OnError(PVOID pv, UINT events) { - return HandleClose(pContext->GetIndex(), nullptr, SO_CLOSE, -1); + return HandleClose(nullptr, SO_CLOSE, -1); } VOID CUdpNode::OnDispatchThreadStart(THR_ID tid) @@ -544,44 +504,44 @@ VOID CUdpNode::OnDispatchThreadEnd(THR_ID tid) OnWorkerThreadEnd(tid); } -BOOL CUdpNode::HandleClose(int idx, TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode) +BOOL CUdpNode::HandleClose(TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode) { if(!HasStarted()) return FALSE; if(iErrorCode == -1) - iErrorCode = ::SSO_GetError(m_soListens[idx]); + iErrorCode = ::SSO_GetError(m_soListen); - if(pBufferObj != nullptr) - TRIGGER(FireError(&pBufferObj->remoteAddr, pBufferObj->Ptr(), pBufferObj->Size(), enOperation, iErrorCode)); - else - TRIGGER(FireError(nullptr, nullptr, 0, enOperation, iErrorCode)); + TRIGGER(FireError(pBufferObj, enOperation, iErrorCode)); return TRUE; } -BOOL CUdpNode::HandleReceive(const TDispContext* pContext, int flag) +BOOL CUdpNode::HandleReceive(int flag) { - int idx = pContext->GetIndex(); - CBufferPtr& buffer = m_rcBuffers[idx]; - int iBufferLen = (int)buffer.Size(); - while(TRUE) { - HP_SOCKADDR addr; - socklen_t dwAddrLen = (socklen_t)addr.AddrSize(); + TNodeBufferObjPtr itPtr(m_bfObjPool, m_bfObjPool.PickFreeItem()); - int rc = (int)recvfrom(m_soListens[idx], buffer.Ptr(), iBufferLen, MSG_TRUNC, addr.Addr(), &dwAddrLen); + int iBufferLen = itPtr->Capacity(); + socklen_t dwAddrLen = (socklen_t)itPtr->remoteAddr.AddrSize(); + + int rc = (int)recvfrom(m_soListen, itPtr->Ptr(), iBufferLen, MSG_TRUNC, itPtr->remoteAddr.Addr(), &dwAddrLen); if(rc >= 0) { if(rc > iBufferLen) { - TRIGGER(FireError(&addr, buffer.Ptr(), iBufferLen, SO_RECEIVE, ERROR_BAD_LENGTH)); + itPtr->Increase(iBufferLen); + TRIGGER(FireError(itPtr, SO_RECEIVE, ERROR_BAD_LENGTH)); + continue; } - TRIGGER(FireReceive(&addr, buffer.Ptr(), rc)); + itPtr->Increase(rc); + m_recvQueue.PushBack(itPtr.Detach()); + + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_RECEIVE, flag)); } else if(rc == SOCKET_ERROR) { @@ -589,7 +549,7 @@ BOOL CUdpNode::HandleReceive(const TDispContext* pContext, int flag) if(code == ERROR_WOULDBLOCK) break; - else if(!HandleClose(idx, nullptr, SO_RECEIVE, code)) + else if(!HandleClose(itPtr, SO_RECEIVE, code)) return FALSE; } else @@ -601,51 +561,78 @@ BOOL CUdpNode::HandleReceive(const TDispContext* pContext, int flag) return TRUE; } -BOOL CUdpNode::HandleSend(const TDispContext* pContext, int flag, int rd) +VOID CUdpNode::HandleCmdReceive(int flag) { - HandleCmdSend(pContext->GetIndex(), flag); + if(m_recvQueue.IsEmpty()) + return; + + int reads = flag ? -1 : MAX_CONTINUE_READS; + + for(int i = 0; i < reads || reads < 0; i++) + { + TNodeBufferObjPtr itPtr(m_bfObjPool); + + if(!m_recvQueue.PopFront(&itPtr.PtrRef())) + break; + + TRIGGER(FireReceive(itPtr)); + } + + if(!m_recvQueue.IsEmpty()) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_RECEIVE, flag)); +} + +BOOL CUdpNode::HandleSend(int flag, int rd) +{ + m_ioDispatcher.ModFD(m_soListen, _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); + + if(rd) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND)); + else + HandleCmdSend(flag); return TRUE; } -VOID CUdpNode::HandleCmdSend(int idx, int flag) +VOID CUdpNode::HandleCmdSend(int flag) { - BOOL bBlocked = FALSE; - TNodeBufferObjList& sndBuff = m_sndBuffs[idx]; + BOOL bBlocked = FALSE; TNodeBufferObjPtr bufPtr(m_bfObjPool); - while(IsPending(idx)) + while(IsPending()) { { - CCriSecLock locallock(m_csSends[idx]); - bufPtr = sndBuff.PopFront(); + CSpinLock locallock(m_csState); + bufPtr = m_sndBuff.PopFront(); } if(!bufPtr.IsValid()) break; - if(!SendItem(idx, sndBuff, bufPtr, bBlocked)) + if(!SendItem(bufPtr, bBlocked)) return; if(bBlocked) { { - CCriSecLock locallock(m_csSends[idx]); - sndBuff.PushFront(bufPtr.Detach()); + CSpinLock locallock(m_csState); + m_sndBuff.PushFront(bufPtr.Detach()); } + m_ioDispatcher.ModFD(m_soListen, EPOLLOUT | _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); + break; } } - if(!bBlocked && IsPending(idx)) - VERIFY(m_ioDispatcher.SendCommandByIndex(idx, DISP_CMD_SEND)); + if(!bBlocked && IsPending()) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND)); } -BOOL CUdpNode::SendItem(int idx, TNodeBufferObjList& sndBuff, TNodeBufferObj* pBufferObj, BOOL& bBlocked) +BOOL CUdpNode::SendItem(TNodeBufferObj* pBufferObj, BOOL& bBlocked) { - int rc = (int)sendto(m_soListens[idx], pBufferObj->Ptr(), pBufferObj->Size(), 0, pBufferObj->remoteAddr.Addr(), pBufferObj->remoteAddr.AddrSize()); + int rc = (int)sendto(m_soListen, pBufferObj->Ptr(), pBufferObj->Size(), 0, pBufferObj->remoteAddr.Addr(), pBufferObj->remoteAddr.AddrSize()); if(rc >= 0) { @@ -653,8 +640,8 @@ BOOL CUdpNode::SendItem(int idx, TNodeBufferObjList& sndBuff, TNodeBufferObj* pB if(rc == 0) { - CCriSecLock locallock(m_csSends[idx]); - sndBuff.ReduceLength(1); + CSpinLock locallock(m_csState); + m_sndBuff.ReduceLength(1); } TRIGGER(FireSend(pBufferObj)); @@ -665,7 +652,7 @@ BOOL CUdpNode::SendItem(int idx, TNodeBufferObjList& sndBuff, TNodeBufferObj* pB if(code == ERROR_WOULDBLOCK) bBlocked = TRUE; - else if(!HandleClose(idx, pBufferObj, SO_SEND, code)) + else if(!HandleClose(pBufferObj, SO_SEND, code)) return FALSE; } else @@ -694,26 +681,10 @@ void CUdpNode::SetLastError(EnSocketError code, LPCSTR func, int ec) ::SetLastError(ec); } -BOOL CUdpNode::GetPendingDataLength(int& iPending) -{ - iPending = 0; - - { - CReentrantReadLock locallock(m_lcState); - - if(!IsValid()) - return FALSE; - - for_each(m_sndBuffs.get(), m_sndBuffs.get() + m_dwWorkerThreadCount, [&iPending](TNodeBufferObjList& sndBuff) { iPending += sndBuff.Length(); }); - } - - return TRUE; -} - EnHandleResult CUdpNode::FireSend(TNodeBufferObj* pBufferObj) { TCHAR szAddress[60]; - int iAddressLen = ARRAY_SIZE(szAddress); + int iAddressLen = sizeof(szAddress) / sizeof(TCHAR); ADDRESS_FAMILY usFamily; USHORT usPort; @@ -722,32 +693,33 @@ EnHandleResult CUdpNode::FireSend(TNodeBufferObj* pBufferObj) return m_pListener->OnSend(this, szAddress, usPort, pBufferObj->Ptr(), pBufferObj->Size()); } -EnHandleResult CUdpNode::FireReceive(const HP_SOCKADDR* pRemoteAddr, const BYTE* pData, int iLength) +EnHandleResult CUdpNode::FireReceive(TNodeBufferObj* pBufferObj) { TCHAR szAddress[60]; - int iAddressLen = ARRAY_SIZE(szAddress); + int iAddressLen = sizeof(szAddress) / sizeof(TCHAR); ADDRESS_FAMILY usFamily; USHORT usPort; - ::sockaddr_IN_2_A(*pRemoteAddr, usFamily, szAddress, iAddressLen, usPort); - return m_pListener->OnReceive(this, szAddress, usPort, pData, iLength); + ::sockaddr_IN_2_A(pBufferObj->remoteAddr, usFamily, szAddress, iAddressLen, usPort); + + return m_pListener->OnReceive(this, szAddress, usPort, pBufferObj->Ptr(), pBufferObj->Size()); } -EnHandleResult CUdpNode::FireError(const HP_SOCKADDR* pRemoteAddr, const BYTE* pData, int iLength, EnSocketOperation enOperation, int iErrorCode) +EnHandleResult CUdpNode::FireError(TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode) { TCHAR szAddress[60]; - int iAddressLen = ARRAY_SIZE(szAddress); + int iAddressLen = sizeof(szAddress) / sizeof(TCHAR); ADDRESS_FAMILY usFamily; USHORT usPort; - if(pRemoteAddr == nullptr) + if(pBufferObj == nullptr) { ::sockaddr_IN_2_A(m_localAddr, usFamily, szAddress, iAddressLen, usPort); return m_pListener->OnError(this, enOperation, iErrorCode, szAddress, usPort, nullptr, 0); } - ::sockaddr_IN_2_A(*pRemoteAddr, usFamily, szAddress, iAddressLen, usPort); - return m_pListener->OnError(this, enOperation, iErrorCode, szAddress, usPort, pData, iLength); + ::sockaddr_IN_2_A(pBufferObj->remoteAddr, usFamily, szAddress, iAddressLen, usPort); + return m_pListener->OnError(this, enOperation, iErrorCode, szAddress, usPort, pBufferObj->Ptr(), pBufferObj->Size()); } #endif diff --git a/UdpNode.h b/UdpNode.h index 67b2ca9..acd9d27 100644 --- a/UdpNode.h +++ b/UdpNode.h @@ -45,23 +45,23 @@ public: virtual BOOL GetLocalAddress (TCHAR lpszAddress[], int& iAddressLen, USHORT& usPort); virtual BOOL GetCastAddress (TCHAR lpszAddress[], int& iAddressLen, USHORT& usPort); + virtual BOOL GetPendingDataLength (int& iPending) {iPending = m_sndBuff.Length(); return HasStarted();} virtual EnSocketError GetLastError () {return m_enLastError;} virtual LPCTSTR GetLastErrorDesc () {return ::GetSocketErrorDesc(m_enLastError);} - virtual BOOL GetPendingDataLength (int& iPending); private: - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) override; - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) override; - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnDispatchThreadStart(THR_ID tid) override; - virtual VOID OnDispatchThreadEnd(THR_ID tid) override; + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) override; + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) override; + virtual VOID OnCommand(TDispCommand* pCmd) override; + virtual BOOL OnReadyRead(PVOID pv, UINT events) override; + virtual BOOL OnReadyWrite(PVOID pv, UINT events) override; + virtual BOOL OnHungUp(PVOID pv, UINT events) override; + virtual BOOL OnError(PVOID pv, UINT events) override; + virtual VOID OnDispatchThreadStart(THR_ID tid) override; + virtual VOID OnDispatchThreadEnd(THR_ID tid) override; public: - virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy){ENSURE_HAS_STOPPED(); ASSERT(m_enReusePolicy == enReusePolicy);} + virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy){ENSURE_HAS_STOPPED(); m_enReusePolicy = enReusePolicy;} virtual void SetWorkerThreadCount (DWORD dwWorkerThreadCount) {ENSURE_HAS_STOPPED(); m_dwWorkerThreadCount = dwWorkerThreadCount;} virtual void SetFreeBufferPoolSize (DWORD dwFreeBufferPoolSize) {ENSURE_HAS_STOPPED(); m_dwFreeBufferPoolSize = dwFreeBufferPoolSize;} virtual void SetFreeBufferPoolHold (DWORD dwFreeBufferPoolHold) {ENSURE_HAS_STOPPED(); m_dwFreeBufferPoolHold = dwFreeBufferPoolHold;} @@ -89,8 +89,8 @@ protected: {return m_pListener->OnShutdown(this);} EnHandleResult FireSend(TNodeBufferObj* pBufferObj); - EnHandleResult FireReceive(const HP_SOCKADDR* pRemoteAddr, const BYTE* pData, int iLength); - EnHandleResult FireError(const HP_SOCKADDR* pRemoteAddr, const BYTE* pData, int iLength, EnSocketOperation enOperation, int iErrorCode); + EnHandleResult FireReceive(TNodeBufferObj* pBufferObj); + EnHandleResult FireError(TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode); void SetLastError(EnSocketError code, LPCSTR func, int ec); virtual BOOL CheckParams(); @@ -100,15 +100,17 @@ protected: virtual void OnWorkerThreadStart(THR_ID dwThreadID) {} virtual void OnWorkerThreadEnd(THR_ID dwThreadID) {} - BOOL DoSend(const HP_SOCKADDR& addrRemote, const BYTE* pBuffer, int iLength, int iOffset = 0); - BOOL DoSendPackets(const HP_SOCKADDR& addrRemote, const WSABUF pBuffers[], int iCount); - int SendInternal(const HP_SOCKADDR& addrRemote, TNodeBufferObjPtr& bufPtr); + BOOL DoSend(HP_SOCKADDR& addrRemote, const BYTE* pBuffer, int iLength, int iOffset = 0); + BOOL DoSendPackets(HP_SOCKADDR& addrRemote, const WSABUF pBuffers[], int iCount); + int SendInternal(HP_SOCKADDR& addrRemote, TNodeBufferObjPtr& bufPtr); private: BOOL CheckStarting(); BOOL CheckStoping(); - BOOL ParseBindAddr(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress, HP_SOCKADDR& bindAddr); - BOOL CreateListenSocket(const HP_SOCKADDR& bindAddr); + BOOL CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress); + BOOL CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort, LPCTSTR lpszCastAddress, HP_SOCKADDR& bindAddr); + BOOL BindListenSocket(HP_SOCKADDR& bindAddr); + BOOL ConnectToGroup(const HP_SOCKADDR& bindAddr); BOOL CreateWorkerThreads(); BOOL StartAccept(); @@ -116,28 +118,29 @@ private: void WaitForWorkerThreadEnd(); void ReleaseFreeBuffer(); - int GenerateBufferIndex(const HP_SOCKADDR& addrRemote); +private: + BOOL HandleReceive(int flag = 0); + BOOL HandleSend(int flag = 0, int rd = 0); + BOOL HandleClose(TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode); + + VOID HandleCmdReceive(int flag); + VOID HandleCmdSend(int flag); + + BOOL SendItem(TNodeBufferObj* pBufferObj, BOOL& bBlocked); private: - BOOL HandleReceive(const TDispContext* pContext, int flag = 0); - BOOL HandleSend(const TDispContext* pContext, int flag = 0, int rd = 0); - BOOL HandleClose(int idx, TNodeBufferObj* pBufferObj, EnSocketOperation enOperation, int iErrorCode); - - VOID HandleCmdSend(int idx, int flag); - - BOOL SendItem(int idx, TNodeBufferObjList& sndBuff, TNodeBufferObj* pBufferObj, BOOL& bBlocked); - -private: - BOOL IsValid () {return m_enState == SS_STARTED;} - BOOL IsPending (int idx) {return m_sndBuffs[idx].Length() > 0;} + BOOL IsValid () {return m_enState == SS_STARTED;} + BOOL IsPending () {return m_sndBuff.Length() > 0;} public: CUdpNode(IUdpNodeListener* pListener) : m_pListener (pListener) + , m_sndBuff (m_bfObjPool) + , m_soListen (INVALID_SOCKET) , m_iSending (0) , m_enLastError (SE_OK) , m_enState (SS_STOPPED) - , m_enReusePolicy (RAP_ADDR_AND_PORT) + , m_enReusePolicy (RAP_ADDR_ONLY) , m_dwWorkerThreadCount (DEFAULT_WORKER_THREAD_COUNT) , m_dwFreeBufferPoolSize (DEFAULT_FREE_BUFFEROBJ_POOL) , m_dwFreeBufferPoolHold (DEFAULT_FREE_BUFFEROBJ_HOLD) @@ -178,17 +181,15 @@ private: HP_SOCKADDR m_localAddr; CNodeBufferObjPool m_bfObjPool; - CNodeCriSecs m_csSends; - TNodeBufferObjLists m_sndBuffs; + TNodeBufferObjList m_sndBuff; + CNodeRecvQueue m_recvQueue; IUdpNodeListener* m_pListener; - ListenSocketsPtr m_soListens; + SOCKET m_soListen; EnServiceState m_enState; EnSocketError m_enLastError; - CReceiveBuffersPtr m_rcBuffers; - - CRWLock m_lcState; + CSpinGuard m_csState; volatile long m_iSending; diff --git a/UdpServer.cpp b/UdpServer.cpp index af7510e..fc9f02d 100644 --- a/UdpServer.cpp +++ b/UdpServer.cpp @@ -61,7 +61,7 @@ void CUdpServer::SetLastError(EnSocketError code, LPCSTR func, int ec) BOOL CUdpServer::CheckParams() { if ((m_enSendPolicy >= SP_PACK && m_enSendPolicy <= SP_DIRECT) && - (m_enOnSendSyncPolicy >= OSSP_NONE && m_enOnSendSyncPolicy <= OSSP_RECEIVE) && + (m_enOnSendSyncPolicy >= OSSP_NONE && m_enOnSendSyncPolicy <= OSSP_CLOSE) && ((int)m_dwMaxConnectionCount > 0 && m_dwMaxConnectionCount <= MAX_CONNECTION_COUNT) && ((int)m_dwWorkerThreadCount > 0 && m_dwWorkerThreadCount <= MAX_WORKER_THREAD_COUNT) && ((int)m_dwFreeSocketObjLockTime >= 1000) && @@ -89,14 +89,6 @@ void CUdpServer::PrepareStart() m_bfObjPool.SetPoolHold(m_dwFreeBufferObjHold); m_bfObjPool.Prepare(); - - m_quSends = make_unique(m_dwWorkerThreadCount); - - m_rcBuffers = make_unique(m_dwWorkerThreadCount); - for_each(m_rcBuffers.get(), m_rcBuffers.get() + m_dwWorkerThreadCount, [this](CBufferPtr& buff) {buff.Malloc(m_dwMaxDatagramSize);}); - - m_soListens = make_unique(m_dwWorkerThreadCount); - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) {sock = INVALID_FD;}); } BOOL CUdpServer::CheckStarting() @@ -134,98 +126,49 @@ BOOL CUdpServer::CheckStoping() BOOL CUdpServer::CreateListenSocket(LPCTSTR lpszBindAddress, USHORT usPort) { + BOOL isOK = FALSE; + if(::IsStrEmpty(lpszBindAddress)) lpszBindAddress = DEFAULT_IPV4_BIND_ADDRESS; HP_SOCKADDR addr; - if(!::sockaddr_A_2_IN(lpszBindAddress, usPort, addr)) + if(::sockaddr_A_2_IN(lpszBindAddress, usPort, addr)) { - SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } + m_soListen = socket(addr.family, SOCK_DGRAM, IPPROTO_UDP); - for(DWORD i = 0; i < m_dwWorkerThreadCount; i++) - { - m_soListens[i] = socket(addr.family, SOCK_DGRAM, IPPROTO_UDP); - SOCKET soListen = m_soListens[i]; - - if(IS_INVALID_FD(soListen)) + if(m_soListen != INVALID_SOCKET) { + ::fcntl_SETFL(m_soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC); + VERIFY(IS_NO_ERROR(::SSO_ReuseAddress(m_soListen, m_enReusePolicy))); + + if(::bind(m_soListen, addr.Addr(), addr.AddrSize()) != SOCKET_ERROR) + { + if(TRIGGER(FirePrepareListen(m_soListen)) != HR_ERROR) + isOK = TRUE; + else + SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); + } + else + SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); + } + else SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - - ::fcntl_SETFL(soListen, O_NOATIME | O_NONBLOCK | O_CLOEXEC); - VERIFY(IS_NO_ERROR(::SSO_ReuseAddress(soListen, m_enReusePolicy))); - - if(IS_HAS_ERROR(::bind(soListen, addr.Addr(), addr.AddrSize()))) - { - SetLastError(SE_SOCKET_BIND, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - - if(TRIGGER(FirePrepareListen(soListen)) == HR_ERROR) - { - SetLastError(SE_SOCKET_PREPARE, __FUNCTION__, ENSURE_ERROR_CANCELLED); - return FALSE; - } } + else + SetLastError(SE_SOCKET_CREATE, __FUNCTION__, ::WSAGetLastError()); - return TRUE; + return isOK; } BOOL CUdpServer::CreateWorkerThreads() { - DWORD dwWorkerThreadCount = m_dwWorkerThreadCount -#ifdef USE_EXTERNAL_GC - + 1 -#endif - ; - - if(!m_ioDispatcher.Start(this, m_dwPostReceiveCount, dwWorkerThreadCount)) - { - SetLastError(SE_WORKER_THREAD_CREATE, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - -#ifdef USE_EXTERNAL_GC - m_fdGCTimer = m_ioDispatcher.AddTimer(m_dwWorkerThreadCount, GC_CHECK_INTERVAL, this); - - if(IS_INVALID_FD(m_fdGCTimer)) - { - SetLastError(SE_GC_START, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } -#endif - - return TRUE; + return m_ioDispatcher.Start(this, m_dwPostReceiveCount, m_dwWorkerThreadCount); } BOOL CUdpServer::StartAccept() { - for(int i = 0; i < (int)m_dwWorkerThreadCount; i++) - { - SOCKET& soListen = m_soListens[i]; - - if(!m_ioDispatcher.AddFD(i, soListen, EPOLLIN | EPOLLOUT | EPOLLET, TO_PVOID(&soListen))) - { - SetLastError(SE_SOCKE_ATTACH_TO_CP, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } - } - -#ifdef USE_EXTERNAL_GC - m_fdGCTimer = m_ioDispatcher.AddTimer(m_dwWorkerThreadCount, GC_CHECK_INTERVAL, this); - - if(IS_INVALID_FD(m_fdGCTimer)) - { - SetLastError(SE_GC_START, __FUNCTION__, ::WSAGetLastError()); - return FALSE; - } -#endif - - return TRUE; + return m_ioDispatcher.AddFD(m_soListen, _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); } BOOL CUdpServer::Stop() @@ -247,7 +190,6 @@ BOOL CUdpServer::Stop() FireShutdown(); ReleaseFreeSocket(); - ClearSendQueues(); Reset(); @@ -256,7 +198,7 @@ BOOL CUdpServer::Stop() void CUdpServer::SendCloseNotify() { - if(!m_soListens) + if(m_soListen == INVALID_SOCKET) return; if(m_bfActiveSockets.Elements() == 0) return; @@ -270,7 +212,7 @@ void CUdpServer::SendCloseNotify() TUdpSocketObj* pSocketObj = FindSocketObj(connID); if(TUdpSocketObj::IsValid(pSocketObj)) - ::SendUdpCloseNotify(m_soListens[pSocketObj->index], pSocketObj->remoteAddr); + ::SendUdpCloseNotify(m_soListen, pSocketObj->remoteAddr); } ::WaitFor(30); @@ -278,19 +220,13 @@ void CUdpServer::SendCloseNotify() void CUdpServer::CloseListenSocket() { - if(m_soListens) - { - for_each(m_soListens.get(), m_soListens.get() + m_dwWorkerThreadCount, [](SOCKET& sock) - { - if(sock != INVALID_FD) - { - ::ManualCloseSocket(sock); - sock = INVALID_FD; - } - }); + if(m_soListen == INVALID_SOCKET) + return; - ::WaitFor(70); - } + ::ManualCloseSocket(m_soListen); + m_soListen = INVALID_SOCKET; + + ::WaitFor(70); } void CUdpServer::DisconnectClientSocket() @@ -329,31 +265,15 @@ void CUdpServer::ReleaseFreeSocket() { m_lsFreeSocket.Clear(); -#ifdef USE_EXTERNAL_GC - if(IS_VALID_FD(m_fdGCTimer)) - { - close(m_fdGCTimer); - m_fdGCTimer = INVALID_FD; - } -#endif - ReleaseGCSocketObj(TRUE); VERIFY(m_lsGCSocket.IsEmpty()); } -void CUdpServer::ClearSendQueues() -{ - if(m_quSends) for_each(m_quSends.get(), m_quSends.get() + m_dwWorkerThreadCount, [](CSendQueue& queue) {queue.UnsafeClear();}); -} - void CUdpServer::Reset() { m_phSocket.Reset(); m_bfObjPool.Clear(); - - m_soListens = nullptr; - m_rcBuffers = nullptr; - m_quSends = nullptr; + m_quSend.UnsafeClear(); m_enState = SS_STOPPED; @@ -406,12 +326,10 @@ void CUdpServer::AddFreeSocketObj(TUdpSocketObj* pSocketObj, EnSocketCloseFlag e m_mpClientAddr.erase(&pSocketObj->remoteAddr); } - m_ioDispatcher.DelTimer(pSocketObj->index, pSocketObj->fdTimer); + m_ioDispatcher.DelTimer(pSocketObj->fdTimer); TUdpSocketObj::Release(pSocketObj); -#ifndef USE_EXTERNAL_GC ReleaseGCSocketObj(); -#endif if(!m_lsFreeSocket.TryPut(pSocketObj)) m_lsGCSocket.PushBack(pSocketObj); @@ -427,18 +345,17 @@ BOOL CUdpServer::InvalidSocketObj(TUdpSocketObj* pSocketObj) return TUdpSocketObj::InvalidSocketObj(pSocketObj); } -void CUdpServer::AddClientSocketObj(int idx, CONNID dwConnID, TUdpSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr) +void CUdpServer::AddClientSocketObj(CONNID dwConnID, TUdpSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr) { ASSERT(FindSocketObj(dwConnID) == nullptr); - pSocketObj->index = idx; + if(IsNeedDetectConnection()) + pSocketObj->fdTimer = m_ioDispatcher.AddTimer(m_dwDetectInterval, pSocketObj); + pSocketObj->pHolder = this; pSocketObj->connTime = ::TimeGetTime(); pSocketObj->activeTime = pSocketObj->connTime; - if(IsNeedDetectConnection()) - pSocketObj->fdTimer = m_ioDispatcher.AddTimer(pSocketObj->index, m_dwDetectInterval, pSocketObj); - remoteAddr.Copy(pSocketObj->remoteAddr); pSocketObj->SetConnected(); @@ -475,10 +392,8 @@ void CUdpServer::CloseClientSocketObj(TUdpSocketObj* pSocketObj, EnSocketCloseFl { ASSERT(TUdpSocketObj::IsExist(pSocketObj)); - SOCKET soListen = m_soListens[pSocketObj->index]; - - if(bNotify && soListen != INVALID_SOCKET) - ::SendUdpCloseNotify(soListen, pSocketObj->remoteAddr); + if(bNotify && m_soListen != INVALID_SOCKET) + ::SendUdpCloseNotify(m_soListen, pSocketObj->remoteAddr); if(enFlag == SCF_CLOSE) FireClose(pSocketObj, SO_CLOSE, SE_OK); @@ -490,13 +405,7 @@ BOOL CUdpServer::GetListenAddress(TCHAR lpszAddress[], int& iAddressLen, USHORT& { ASSERT(lpszAddress != nullptr && iAddressLen > 0); - if(!HasStarted()) - { - ::SetLastError(ERROR_INVALID_STATE); - return FALSE; - } - - return ::GetSocketLocalAddress(m_soListens[0], lpszAddress, iAddressLen, usPort); + return ::GetSocketLocalAddress(m_soListen, lpszAddress, iAddressLen, usPort); } BOOL CUdpServer::GetLocalAddress(CONNID dwConnID, TCHAR lpszAddress[], int& iAddressLen, USHORT& usPort) @@ -511,7 +420,7 @@ BOOL CUdpServer::GetLocalAddress(CONNID dwConnID, TCHAR lpszAddress[], int& iAdd return FALSE; } - return ::GetSocketLocalAddress(m_soListens[pSocketObj->index], lpszAddress, iAddressLen, usPort); + return ::GetSocketLocalAddress(m_soListen, lpszAddress, iAddressLen, usPort); } BOOL CUdpServer::GetRemoteAddress(CONNID dwConnID, TCHAR lpszAddress[], int& iAddressLen, USHORT& usPort) @@ -742,7 +651,7 @@ BOOL CUdpServer::Disconnect(CONNID dwConnID, BOOL bForce) return FALSE; } - return m_ioDispatcher.SendCommandByIndex(pSocketObj->index, DISP_CMD_DISCONNECT, dwConnID, bForce); + return m_ioDispatcher.SendCommand(DISP_CMD_DISCONNECT, dwConnID, bForce); } BOOL CUdpServer::DisconnectLongConnections(DWORD dwPeriod, BOOL bForce) @@ -801,17 +710,10 @@ BOOL CUdpServer::PauseReceive(CONNID dwConnID, BOOL bPause) return FALSE; } -BOOL CUdpServer::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpServer::OnBeforeProcessIo(PVOID pv, UINT events) { - if(pv == &m_soListens[pContext->GetIndex()]) + if(pv == &m_soListen) return TRUE; - else if(pv == this) - { - ReleaseGCSocketObj(FALSE); - ::ReadTimer(m_fdGCTimer); - - return FALSE; - } if(!(events & _EPOLL_ALL_ERROR_EVENTS)) DetectConnection(pv); @@ -819,25 +721,26 @@ BOOL CUdpServer::OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT return FALSE; } -VOID CUdpServer::OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) +VOID CUdpServer::OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) { } -VOID CUdpServer::OnCommand(const TDispContext* pContext, TDispCommand* pCmd) +VOID CUdpServer::OnCommand(TDispCommand* pCmd) { - CONNID dwConnID = (CONNID)(pCmd->wParam); - switch(pCmd->type) { case DISP_CMD_SEND: - HandleCmdSend(dwConnID, (int)(pCmd->lParam)); + HandleCmdSend((CONNID)(pCmd->wParam), (int)(pCmd->lParam)); + break; + case DISP_CMD_RECEIVE: + HandleCmdReceive((CONNID)(pCmd->wParam), (int)(pCmd->lParam)); break; case DISP_CMD_DISCONNECT: - HandleCmdDisconnect(dwConnID, (BOOL)pCmd->lParam); + HandleCmdDisconnect((CONNID)(pCmd->wParam), (BOOL)pCmd->lParam); break; case DISP_CMD_TIMEOUT: - HandleCmdTimeout(dwConnID); + HandleCmdTimeout((CONNID)(pCmd->wParam)); break; } } @@ -852,22 +755,22 @@ VOID CUdpServer::HandleCmdTimeout(CONNID dwConnID) AddFreeSocketObj(FindSocketObj(dwConnID), SCF_CLOSE, SO_UNKNOWN, 0, FALSE); } -BOOL CUdpServer::OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpServer::OnReadyRead(PVOID pv, UINT events) { - return HandleReceive(pContext, RETRIVE_EVENT_FLAG_H(events)); + return HandleReceive(RETRIVE_EVENT_FLAG_H(events)); } -BOOL CUdpServer::OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpServer::OnReadyWrite(PVOID pv, UINT events) { - return HandleSend(pContext, RETRIVE_EVENT_FLAG_H(events)); + return HandleSend(RETRIVE_EVENT_FLAG_H(events)); } -BOOL CUdpServer::OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpServer::OnHungUp(PVOID pv, UINT events) { return HandleClose(nullptr, SO_CLOSE, 0); } -BOOL CUdpServer::OnError(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CUdpServer::OnError(PVOID pv, UINT events) { return HandleClose(nullptr, SO_CLOSE, -1); } @@ -893,7 +796,7 @@ BOOL CUdpServer::HandleClose(TUdpSocketObj* pSocketObj, EnSocketOperation enOper } if(iErrorCode == -1) - iErrorCode = ::SSO_GetError(m_soListens[pSocketObj->index]); + iErrorCode = ::SSO_GetError(m_soListen); EnSocketCloseFlag enFlag = IS_NO_ERROR(iErrorCode) ? SCF_CLOSE : SCF_ERROR; @@ -902,18 +805,17 @@ BOOL CUdpServer::HandleClose(TUdpSocketObj* pSocketObj, EnSocketOperation enOper return FALSE; } -BOOL CUdpServer::HandleReceive(const TDispContext* pContext, int flag) +BOOL CUdpServer::HandleReceive(int flag) { - int idx = pContext->GetIndex(); - CBufferPtr& buffer = m_rcBuffers[idx]; - int iBufferLen = (int)buffer.Size(); - while(TRUE) { HP_SOCKADDR addr; socklen_t dwAddrLen = (socklen_t)addr.AddrSize(); - int rc = (int)recvfrom(m_soListens[idx], buffer.Ptr(), iBufferLen, MSG_TRUNC, addr.Addr(), &dwAddrLen); + TItemPtr itPtr(m_bfObjPool, m_bfObjPool.PickFreeItem()); + int iBufferLen = itPtr->Capacity(); + + int rc = (int)recvfrom(m_soListen, itPtr->Ptr(), iBufferLen, MSG_TRUNC, addr.Addr(), &dwAddrLen); if(rc >= 0) { @@ -924,12 +826,11 @@ BOOL CUdpServer::HandleReceive(const TDispContext* pContext, int flag) if(rc > iBufferLen) continue; - if((dwConnID = HandleAccept(pContext, addr)) == 0) + if((dwConnID = HandleAccept(addr)) == 0) continue; } TUdpSocketObj* pSocketObj = FindSocketObj(dwConnID); - ASSERT(pSocketObj->index == idx); if(!TUdpSocketObj::IsValid(pSocketObj)) continue; @@ -946,19 +847,25 @@ BOOL CUdpServer::HandleReceive(const TDispContext* pContext, int flag) continue; } - if(::IsUdpCloseNotify(buffer.Ptr(), rc)) + if(::IsUdpCloseNotify(itPtr->Ptr(), rc)) { AddFreeSocketObj(pSocketObj, SCF_CLOSE, SO_CLOSE, SE_OK, FALSE); continue; } - if(TRIGGER(FireReceive(pSocketObj, buffer.Ptr(), rc)) == HR_ERROR) + itPtr->Increase(rc); + { - TRACE(" OnReceive() event return 'HR_ERROR', connection will be closed !", dwConnID); + CLocalSafeCounter localcounter(*pSocketObj); + CReentrantReadLock locallock(pSocketObj->lcIo); - AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_RECEIVE, ENSURE_ERROR_CANCELLED);; - continue; + if(!TUdpSocketObj::IsValid(pSocketObj)) + continue; + + pSocketObj->recvQueue.PushBack(itPtr.Detach()); } + + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_RECEIVE, dwConnID, flag)); } else if(rc == SOCKET_ERROR) { @@ -978,20 +885,32 @@ BOOL CUdpServer::HandleReceive(const TDispContext* pContext, int flag) return TRUE; } -CONNID CUdpServer::HandleAccept(const TDispContext* pContext, HP_SOCKADDR& addr) +CONNID CUdpServer::HandleAccept(HP_SOCKADDR& addr) { - int idx = pContext->GetIndex(); CONNID dwConnID = 0; TUdpSocketObj* pSocketObj = nullptr; - if(!m_bfActiveSockets.AcquireLock(dwConnID)) { - ::SendUdpCloseNotify(m_soListens[idx], addr); - return 0; - } + CCriSecLock locallock(m_csAccept); - pSocketObj = GetFreeSocketObj(dwConnID); - AddClientSocketObj(idx, dwConnID, pSocketObj, addr); + dwConnID = FindConnectionID(&addr); + + if(dwConnID != 0) + return dwConnID; + else + { + if(!m_bfActiveSockets.AcquireLock(dwConnID)) + { + ::SendUdpCloseNotify(m_soListen, addr); + return 0; + } + + pSocketObj = GetFreeSocketObj(dwConnID); + pSocketObj->lcIo.WaitToWrite(); + + AddClientSocketObj(dwConnID, pSocketObj, addr); + } + } if(TriggerFireAccept(pSocketObj) == HR_ERROR) { @@ -999,6 +918,8 @@ CONNID CUdpServer::HandleAccept(const TDispContext* pContext, HP_SOCKADDR& addr) dwConnID = 0; } + pSocketObj->lcIo.WriteDone(); + return dwConnID; } @@ -1011,18 +932,71 @@ void CUdpServer::HandleZeroBytes(TUdpSocketObj* pSocketObj) #if defined(DEBUG_TRACE) int rc = (int) #endif - sendto(m_soListens[pSocketObj->index], nullptr, 0, 0, pSocketObj->remoteAddr.Addr(), pSocketObj->remoteAddr.AddrSize()); + sendto(m_soListen, nullptr, 0, 0, pSocketObj->remoteAddr.Addr(), pSocketObj->remoteAddr.AddrSize()); TRACE(" send 0 bytes (detect ack package - %s)", pSocketObj->connID, IS_HAS_ERROR(rc) ? "fail" : "succ"); } -BOOL CUdpServer::HandleSend(const TDispContext* pContext, int flag) +VOID CUdpServer::HandleCmdReceive(CONNID dwConnID, int flag) { - CSendQueue& quSend = m_quSends[pContext->GetIndex()]; - CONNID dwConnID = 0; + TUdpSocketObj* pSocketObj = FindSocketObj(dwConnID); - while(quSend.PopFront(&dwConnID)) - HandleCmdSend(dwConnID, flag); + if(!TUdpSocketObj::IsValid(pSocketObj)) + return; + if(pSocketObj->recvQueue.IsEmpty()) + return; + + BOOL bCancel = FALSE; + + { + CLocalSafeCounter localcounter(*pSocketObj); + CReentrantReadLock locallock(pSocketObj->lcIo); + + if(!TUdpSocketObj::IsValid(pSocketObj)) + return; + if(pSocketObj->recvQueue.IsEmpty()) + return; + + pSocketObj->detectFails = 0; + if(m_bMarkSilence) pSocketObj->activeTime = ::TimeGetTime(); + + int reads = flag ? -1 : MAX_CONTINUE_READS; + + for(int i = 0; i < reads || reads < 0; i++) + { + TItemPtr itPtr(m_bfObjPool); + + if(!pSocketObj->recvQueue.PopFront(&itPtr.PtrRef())) + break; + + if(TRIGGER(FireReceive(pSocketObj, itPtr->Ptr(), itPtr->Size())) == HR_ERROR) + { + TRACE(" OnReceive() event return 'HR_ERROR', connection will be closed !", dwConnID); + + bCancel = TRUE; + break; + } + } + } + + if(bCancel) + AddFreeSocketObj(pSocketObj, SCF_ERROR, SO_RECEIVE, ENSURE_ERROR_CANCELLED); + else + { + if(TUdpSocketObj::IsValid(pSocketObj) && pSocketObj->HasRecvData()) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_RECEIVE, dwConnID, flag)); + } +} + + +BOOL CUdpServer::HandleSend(int flag) +{ + m_ioDispatcher.ModFD(m_soListen, _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); + + CONNID dwConnID = 0; + + while(m_quSend.PopFront(&dwConnID)) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND, dwConnID)); return TRUE; } @@ -1034,47 +1008,63 @@ VOID CUdpServer::HandleCmdSend(CONNID dwConnID, int flag) if(!TUdpSocketObj::IsValid(pSocketObj) || !pSocketObj->IsPending()) return; + BOOL bClose = FALSE; BOOL bBlocked = FALSE; int writes = flag ? -1 : MAX_CONTINUE_WRITES; TBufferObjList& sndBuff = pSocketObj->sndBuff; TItemPtr itPtr(sndBuff); - for(int i = 0; i < writes || writes < 0; i++) { - { - CReentrantCriSecLock locallock(pSocketObj->csSend); - itPtr = sndBuff.PopFront(); - } + CLocalSafeCounter localcounter(*pSocketObj); + CReentrantReadLock locallock(pSocketObj->lcSend); - if(!itPtr.IsValid()) - break; - - ASSERT(!itPtr->IsEmpty()); - - if(!SendItem(pSocketObj, itPtr, bBlocked)) + if(!TUdpSocketObj::IsValid(pSocketObj) || !pSocketObj->IsPending()) return; - if(bBlocked) + for(int i = 0; i < writes || writes < 0; i++) { { - CReentrantCriSecLock locallock(pSocketObj->csSend); - sndBuff.PushFront(itPtr.Detach()); + CCriSecLock locallock(pSocketObj->csSend); + itPtr = sndBuff.PopFront(); } - m_quSends[pSocketObj->index].PushBack(dwConnID); + if(!itPtr.IsValid()) + break; - break; + ASSERT(!itPtr->IsEmpty()); + + if(!SendItem(pSocketObj, itPtr, bBlocked)) + { + bClose = TRUE; + break; + } + + if(bBlocked) + { + { + CCriSecLock locallock(pSocketObj->csSend); + sndBuff.PushFront(itPtr.Detach()); + } + + m_quSend.PushBack(dwConnID); + + m_ioDispatcher.ModFD(m_soListen, EPOLLOUT | _EPOLL_READ_EVENTS | EPOLLET, TO_PVOID(&m_soListen)); + + break; + } } } - if(!bBlocked && pSocketObj->IsPending()) - VERIFY(m_ioDispatcher.SendCommandByIndex(pSocketObj->index, DISP_CMD_SEND, dwConnID)); + if(bClose) + HandleClose(pSocketObj, SO_SEND, ::WSAGetLastError()); + else if(!bBlocked && pSocketObj->IsPending()) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND, dwConnID)); } BOOL CUdpServer::SendItem(TUdpSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocked) { - int rc = (int)sendto(m_soListens[pSocketObj->index], pItem->Ptr(), pItem->Size(), 0, pSocketObj->remoteAddr.Addr(), pSocketObj->remoteAddr.AddrSize()); + int rc = (int)sendto(m_soListen, pItem->Ptr(), pItem->Size(), 0, pSocketObj->remoteAddr.Addr(), pSocketObj->remoteAddr.AddrSize()); if(rc > 0) { @@ -1092,7 +1082,7 @@ BOOL CUdpServer::SendItem(TUdpSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocke if(code == ERROR_WOULDBLOCK) bBlocked = TRUE; - else if(!HandleClose(pSocketObj, SO_SEND, code)) + else return FALSE; } else @@ -1194,7 +1184,7 @@ int CUdpServer::SendInternal(TUdpSocketObj* pSocketObj, TItemPtr& itPtr) { CLocalSafeCounter localcounter(*pSocketObj); - CReentrantCriSecLock locallock(pSocketObj->csSend); + CCriSecLock locallock(pSocketObj->csSend); if(!TUdpSocketObj::IsValid(pSocketObj)) return ERROR_OBJECT_NOT_FOUND; @@ -1205,8 +1195,8 @@ int CUdpServer::SendInternal(TUdpSocketObj* pSocketObj, TItemPtr& itPtr) ASSERT(pSocketObj->sndBuff.Length() > 0); } - if(!bPending && pSocketObj->IsPending()) - VERIFY(m_ioDispatcher.SendCommandByIndex(pSocketObj->index, DISP_CMD_SEND, pSocketObj->connID)); + if(!bPending) + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND, pSocketObj->connID)); return NO_ERROR; } @@ -1220,7 +1210,7 @@ void CUdpServer::DetectConnection(PVOID pv) CUdpServer* pServer = (CUdpServer*)pSocketObj->pHolder; if(pSocketObj->detectFails >= pServer->m_dwDetectAttempts) - VERIFY(m_ioDispatcher.SendCommandByIndex(pSocketObj->index, DISP_CMD_TIMEOUT, pSocketObj->connID)); + VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_TIMEOUT, pSocketObj->connID)); else ::InterlockedIncrement(&pSocketObj->detectFails); diff --git a/UdpServer.h b/UdpServer.h index b42caa9..cdaf44a 100644 --- a/UdpServer.h +++ b/UdpServer.h @@ -31,9 +31,8 @@ class CUdpServer : public IUdpServer, private CIOHandler { - using CWorkerThread = CThread; - using CSendQueue = CCASSimpleQueue; - using CSendQueuesPtr = unique_ptr; + using CWorkerThread = CThread; + using CSendQueue = CCASSimpleQueue; public: virtual BOOL Start (LPCTSTR lpszBindAddress, USHORT usPort); @@ -62,25 +61,25 @@ public: virtual LPCTSTR GetLastErrorDesc () {return ::GetSocketErrorDesc(m_enLastError);} private: - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) override; - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) override; - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) override; - virtual VOID OnDispatchThreadStart(THR_ID tid) override; - virtual VOID OnDispatchThreadEnd(THR_ID tid) override; + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) override; + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) override; + virtual VOID OnCommand(TDispCommand* pCmd) override; + virtual BOOL OnReadyRead(PVOID pv, UINT events) override; + virtual BOOL OnReadyWrite(PVOID pv, UINT events) override; + virtual BOOL OnHungUp(PVOID pv, UINT events) override; + virtual BOOL OnError(PVOID pv, UINT events) override; + virtual VOID OnDispatchThreadStart(THR_ID tid) override; + virtual VOID OnDispatchThreadEnd(THR_ID tid) override; public: - virtual BOOL IsSecure () {return FALSE;} + virtual BOOL IsSecure () {return FALSE;} virtual BOOL SetConnectionExtra(CONNID dwConnID, PVOID pExtra); virtual BOOL GetConnectionExtra(CONNID dwConnID, PVOID* ppExtra); - virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enReusePolicy == enReusePolicy);} - virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enSendPolicy == enSendPolicy);} - virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); ASSERT(m_enOnSendSyncPolicy == enOnSendSyncPolicy);} + virtual void SetReuseAddressPolicy (EnReuseAddressPolicy enReusePolicy) {ENSURE_HAS_STOPPED(); m_enReusePolicy = enReusePolicy;} + virtual void SetSendPolicy (EnSendPolicy enSendPolicy) {ENSURE_HAS_STOPPED(); m_enSendPolicy = enSendPolicy;} + virtual void SetOnSendSyncPolicy (EnOnSendSyncPolicy enOnSendSyncPolicy) {ENSURE_HAS_STOPPED(); m_enOnSendSyncPolicy = enOnSendSyncPolicy;} virtual void SetMaxConnectionCount (DWORD dwMaxConnectionCount) {ENSURE_HAS_STOPPED(); m_dwMaxConnectionCount = dwMaxConnectionCount;} virtual void SetWorkerThreadCount (DWORD dwWorkerThreadCount) {ENSURE_HAS_STOPPED(); m_dwWorkerThreadCount = dwWorkerThreadCount;} virtual void SetFreeSocketObjLockTime (DWORD dwFreeSocketObjLockTime) {ENSURE_HAS_STOPPED(); m_dwFreeSocketObjLockTime = dwFreeSocketObjLockTime;} @@ -154,10 +153,8 @@ protected: virtual void PrepareStart(); virtual void Reset(); - virtual void OnWorkerThreadStart(THR_ID tid) {} - virtual void OnWorkerThreadEnd(THR_ID tid) {} - - virtual void ReleaseGCSocketObj(BOOL bForce = FALSE); + virtual void OnWorkerThreadStart(THR_ID tid) {} + virtual void OnWorkerThreadEnd(THR_ID tid) {} TUdpSocketObj* FindSocketObj(CONNID dwConnID); int SendInternal(TUdpSocketObj* pSocketObj, TItemPtr& itPtr); @@ -189,7 +186,6 @@ private: void WaitForClientSocketClose(); void ReleaseClientSocket(); void ReleaseFreeSocket(); - void ClearSendQueues(); void WaitForWorkerThreadEnd(); TUdpSocketObj* GetFreeSocketObj(CONNID dwConnID); @@ -198,36 +194,38 @@ private: void AddFreeSocketObj(TUdpSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0, BOOL bNotify = TRUE); void DeleteSocketObj(TUdpSocketObj* pSocketObj); BOOL InvalidSocketObj(TUdpSocketObj* pSocketObj); - void AddClientSocketObj(int idx, CONNID dwConnID, TUdpSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr); + void ReleaseGCSocketObj(BOOL bForce = FALSE); + void AddClientSocketObj(CONNID dwConnID, TUdpSocketObj* pSocketObj, const HP_SOCKADDR& remoteAddr); void CloseClientSocketObj(TUdpSocketObj* pSocketObj, EnSocketCloseFlag enFlag = SCF_NONE, EnSocketOperation enOperation = SO_UNKNOWN, int iErrorCode = 0, BOOL bNotify = TRUE); EnHandleResult TriggerFireAccept(TUdpSocketObj* pSocketObj); private: VOID HandleCmdSend (CONNID dwConnID, int flag); + VOID HandleCmdReceive (CONNID dwConnID, int flag); VOID HandleCmdDisconnect(CONNID dwConnID, BOOL bForce); VOID HandleCmdTimeout (CONNID dwConnID); - CONNID HandleAccept (const TDispContext* pContext, HP_SOCKADDR& addr); - BOOL HandleReceive (const TDispContext* pContext, int flag = 0); - BOOL HandleSend (const TDispContext* pContext, int flag = 0); + CONNID HandleAccept (HP_SOCKADDR& addr); + BOOL HandleReceive (int flag = 0); + BOOL HandleSend (int flag = 0); BOOL HandleClose (TUdpSocketObj* pSocketObj, EnSocketOperation enOperation, int iErrorCode); void HandleZeroBytes (TUdpSocketObj* pSocketObj); BOOL SendItem (TUdpSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocked); void DetectConnection (PVOID pv); - BOOL IsNeedDetectConnection () const {return m_dwDetectAttempts > 0 && m_dwDetectInterval > 0;} + BOOL IsNeedDetectConnection () {return m_dwDetectAttempts > 0 && m_dwDetectInterval > 0;} public: CUdpServer(IUdpServerListener* pListener) : m_pListener (pListener) + , m_soListen (INVALID_SOCKET) , m_enLastError (SE_OK) , m_enState (SS_STOPPED) - , m_fdGCTimer (INVALID_FD) , m_enSendPolicy (SP_PACK) - , m_enOnSendSyncPolicy (OSSP_RECEIVE) - , m_enReusePolicy (RAP_ADDR_AND_PORT) + , m_enOnSendSyncPolicy (OSSP_NONE) + , m_enReusePolicy (RAP_ADDR_ONLY) , m_dwMaxConnectionCount (DEFAULT_CONNECTION_COUNT) , m_dwWorkerThreadCount (DEFAULT_WORKER_THREAD_COUNT) , m_dwFreeSocketObjLockTime (DEFAULT_FREE_SOCKETOBJ_LOCK_TIME) @@ -273,17 +271,15 @@ private: CSEM m_evWait; IUdpServerListener* m_pListener; - ListenSocketsPtr m_soListens; + SOCKET m_soListen; EnServiceState m_enState; EnSocketError m_enLastError; - CReceiveBuffersPtr m_rcBuffers; - CPrivateHeap m_phSocket; CSpinGuard m_csState; - FD m_fdGCTimer; + CCriSec m_csAccept; TUdpSocketObjPtrPool m_bfActiveSockets; @@ -293,7 +289,7 @@ private: TUdpSocketObjPtrList m_lsFreeSocket; TUdpSocketObjPtrQueue m_lsGCSocket; - CSendQueuesPtr m_quSends; + CSendQueue m_quSend; CIODispatcher m_ioDispatcher; }; diff --git a/common/BufferPool.cpp b/common/BufferPool.cpp index 447b698..37c64b9 100644 --- a/common/BufferPool.cpp +++ b/common/BufferPool.cpp @@ -208,9 +208,8 @@ void CBufferPool::PutFreeBuffer(TBuffer* pBuffer) { m_itPool.PutFreeItem(pBuffer->items); -#ifndef USE_EXTERNAL_GC ReleaseGCBuffer(); -#endif + if(!m_lsFreeBuffer.TryPut(pBuffer)) m_lsGCBuffer.PushBack(pBuffer); } diff --git a/common/BufferPool.h b/common/BufferPool.h index 6957f2d..451a103 100644 --- a/common/BufferPool.h +++ b/common/BufferPool.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "STLHelper.h" #include "RingBuffer.h" @@ -800,6 +800,7 @@ public: void Prepare (); void Clear (); +private: void ReleaseGCBuffer (BOOL bForce = FALSE); public: diff --git a/common/BufferPtr.h b/common/BufferPtr.h index 8e0eb0c..9dd87b0 100644 --- a/common/BufferPtr.h +++ b/common/BufferPtr.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include #include diff --git a/common/CriSec.h b/common/CriSec.h index dbcecf9..6009e88 100644 --- a/common/CriSec.h +++ b/common/CriSec.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "FuncHelper.h" diff --git a/common/Event.h b/common/Event.h index 5b54fbb..af90a32 100644 --- a/common/Event.h +++ b/common/Event.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "FuncHelper.h" #include "PollHelper.h" diff --git a/common/FuncHelper.h b/common/FuncHelper.h index e522994..cd9d621 100644 --- a/common/FuncHelper.h +++ b/common/FuncHelper.h @@ -23,8 +23,8 @@ #pragma once -#include "hpsocket/GlobalDef.h" -#include "hpsocket/GlobalErrno.h" +#include "../hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalErrno.h" #include "SysHelper.h" #include @@ -102,7 +102,7 @@ using namespace std; #define IS_OK(rs) ((BOOL)(rs)) #define IS_NOT_OK(rs) (!IS_OK(rs)) -#define IS_ERROR(code) (::GetLastError() == (code)) +#define IS_ERROR(code) (::GetLastError() == code) #define CONTINUE_IF_ERROR(code) {if(IS_ERROR(code)) continue;} #define BREAK_IF_ERROR(code) {if(IS_ERROR(code)) break;} @@ -133,7 +133,7 @@ inline void PrintError(LPCSTR subject) {perror(subject);} #define EXECUTE_RESTORE_ERROR(expr) {int __le_ = ::GetLastError(); (expr); ::SetLastError(__le_);} #define EXECUTE_RESTORE_ERROR_RT(T, expr)\ ({int __le_ = ::GetLastError(); T __rs_ = (expr); ::SetLastError(__le_); __rs_;}) -#define ENSURE_ERROR(def_code) ({int __le_ = ::GetLastError(); if(__le_ == NO_ERROR) __le_ = (def_code); __le_;}) +#define ENSURE_ERROR(def_code) ({int __le_ = ::GetLastError(); if(__le_ == 0) __le_ = (def_code); __le_;}) #define ENSURE_ERROR_CANCELLED ENSURE_ERROR(ERROR_CANCELLED) #define TRIGGER(expr) EXECUTE_RESET_ERROR((expr)) @@ -171,9 +171,6 @@ inline void PrintError(LPCSTR subject) {perror(subject);} #define TO_PVOID(v) ((PVOID)(UINT_PTR)(v)) #define FROM_PVOID(T, pv) ((T)(UINT_PTR)(pv)) -#define IS_NULL(v) ((v) == nullptr) -#define IS_NOT_NULL(v) (!IS_NULL(v)) - #define stricmp strcasecmp #define strnicmp strncasecmp #define wcsicmp wcscasecmp diff --git a/common/GeneralHelper.h b/common/GeneralHelper.h index a683fb1..4858640 100644 --- a/common/GeneralHelper.h +++ b/common/GeneralHelper.h @@ -23,8 +23,8 @@ #pragma once -#include "hpsocket/GlobalDef.h" -#include "hpsocket/GlobalErrno.h" +#include "../hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalErrno.h" #include "Singleton.h" #include "STLHelper.h" #include "FuncHelper.h" diff --git a/common/IODispatcher.cpp b/common/IODispatcher.cpp index 45719c5..c0af3a8 100644 --- a/common/IODispatcher.cpp +++ b/common/IODispatcher.cpp @@ -27,10 +27,10 @@ #include #include -volatile UINT CIODispatcher::sm_uiNum = MAXUINT; +volatile UINT CIODispatcher::sm_uiNum = 0; LPCTSTR CIODispatcher::WORKER_THREAD_PREFIX = _T("io-disp-"); -BOOL CIODispatcher::Start(IIOHandler* pHandler, int iWorkerMaxEvents, int iWorkers) +BOOL CIODispatcher::Start(IIOHandler* pHandler, int iWorkerMaxEvents, int iWorkers, LLONG llTimerInterval) { ASSERT_CHECK_EINVAL(pHandler && iWorkerMaxEvents >= 0 && iWorkers >= 0); CHECK_ERROR(!HasStarted(), ERROR_INVALID_STATE); @@ -42,42 +42,44 @@ BOOL CIODispatcher::Start(IIOHandler* pHandler, int iWorkerMaxEvents, int iWorke m_iWorkers = iWorkers; m_pHandler = pHandler; + m_epoll = epoll_create1(EPOLL_CLOEXEC); + CHECK_ERROR_FD(m_epoll); + + m_evCmd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); + + if(IS_INVALID_FD(m_evCmd)) + goto START_ERROR; + + if(!VERIFY(AddFD(m_evCmd, EPOLLIN | EPOLLET, &m_evCmd))) + goto START_ERROR; + m_evExit = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC | EFD_SEMAPHORE); if(IS_INVALID_FD(m_evExit)) goto START_ERROR; - m_pContexts = make_unique(m_iWorkers); + if(!VERIFY(AddFD(m_evExit, EPOLLIN, &m_evExit))) + goto START_ERROR; + + if(llTimerInterval > 0) + { + m_evTimer = AddTimer(llTimerInterval, &m_evTimer); + + if(IS_INVALID_FD(m_evTimer)) + goto START_ERROR; + } + + sigset_t ss; + sigemptyset(&ss); + sigaddset(&ss, SIGPIPE); + + VERIFY_IS_NO_ERROR(pthread_sigmask(SIG_BLOCK, &ss, nullptr)); + + m_pWorkers = make_unique(m_iWorkers); for(int i = 0; i < m_iWorkers; i++) { - TDispContext& ctx = m_pContexts[i]; - - ctx.m_iIndex = i; - - ctx.m_epoll = epoll_create1(EPOLL_CLOEXEC); - CHECK_ERROR_FD(ctx.m_epoll); - - ctx.m_evCmd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); - - if(IS_INVALID_FD(ctx.m_evCmd)) - goto START_ERROR; - - if(!VERIFY(AddFD(i, ctx.m_evCmd, EPOLLIN | EPOLLET, &ctx.m_evCmd))) - goto START_ERROR; - - if(!VERIFY(AddFD(i, m_evExit, EPOLLIN, &m_evExit))) - goto START_ERROR; - - sigset_t ss; - sigemptyset(&ss); - sigaddset(&ss, SIGPIPE); - - VERIFY_IS_NO_ERROR(pthread_sigmask(SIG_BLOCK, &ss, nullptr)); - - ctx.m_pWorker = make_unique(); - - if(!VERIFY(ctx.m_pWorker->Start(this, &CIODispatcher::WorkerProc, &ctx))) + if(!VERIFY(m_pWorkers[i].Start(this, &CIODispatcher::WorkerProc))) goto START_ERROR; } @@ -94,38 +96,36 @@ BOOL CIODispatcher::Stop(BOOL bCheck) BOOL isOK = TRUE; - if(m_pContexts) + if(m_pWorkers) { isOK &= IS_NO_ERROR(eventfd_write(m_evExit, m_iWorkers)); for(int i = 0; i < m_iWorkers; i++) - { - TDispContext& ctx = m_pContexts[i]; + isOK &= m_pWorkers[i].Join(); + } - if(ctx.m_pWorker) - isOK &= ctx.m_pWorker->Join(); + if(!m_queue.IsEmpty()) + { + TDispCommand* pCmd = nullptr; - if(!ctx.m_queue.IsEmpty()) - { - TDispCommand* pCmd = nullptr; + while(m_queue.PopFront(&pCmd)) + TDispCommand::Destruct(pCmd); - while(ctx.m_queue.PopFront(&pCmd)) - TDispCommand::Destruct(pCmd); - - VERIFY(ctx.m_queue.IsEmpty()); - } - - if(IS_VALID_FD(ctx.m_evCmd)) - isOK &= IS_NO_ERROR(close(ctx.m_evCmd)); - - if(IS_VALID_FD(ctx.m_epoll)) - isOK &= IS_NO_ERROR(close(ctx.m_epoll)); - } + VERIFY(m_queue.IsEmpty()); } if(IS_VALID_FD(m_evExit)) isOK &= IS_NO_ERROR(close(m_evExit)); + if(IS_VALID_FD(m_evCmd)) + isOK &= IS_NO_ERROR(close(m_evCmd)); + + if(IS_VALID_FD(m_evTimer)) + isOK &= IS_NO_ERROR(close(m_evTimer)); + + if(IS_VALID_FD(m_epoll)) + isOK &= IS_NO_ERROR(close(m_epoll)); + Reset(); return isOK; @@ -133,78 +133,54 @@ BOOL CIODispatcher::Stop(BOOL bCheck) VOID CIODispatcher::Reset() { - m_uiSeq = MAXUINT; + m_uiSeq = 0; m_iWorkers = 0; m_iMaxEvents= 0; - m_evExit = INVALID_FD; m_pHandler = nullptr; - m_pContexts = nullptr; + m_pWorkers = nullptr; + m_epoll = INVALID_FD; + m_evCmd = INVALID_FD; + m_evExit = INVALID_FD; + m_evTimer = INVALID_FD; } -VOID CIODispatcher::MakePrefix() + +void CIODispatcher::MakePrefix() { UINT uiNumber = ::InterlockedIncrement(&sm_uiNum); m_strPrefix.Format(_T("%s%u-"), WORKER_THREAD_PREFIX, uiNumber); } -TDispContext& CIODispatcher::GetContext(int idx, FD fd) +BOOL CIODispatcher::SendCommand(USHORT t, UINT_PTR wp, UINT_PTR lp) { - if(idx < 0) idx = fd; - ASSERT(idx >= 0); - if(idx >= m_iWorkers) idx %= m_iWorkers; - - return m_pContexts[idx]; + return SendCommand(TDispCommand::Construct(t, wp, lp)); } -BOOL CIODispatcher::SendCommandByIndex(int idx, USHORT t, UINT_PTR wp, UINT_PTR lp) +BOOL CIODispatcher::SendCommand(TDispCommand* pCmd) { - return SendCommandByIndex(idx, TDispCommand::Construct(t, wp, lp)); + m_queue.PushBack(pCmd); + return VERIFY_IS_NO_ERROR(eventfd_write(m_evCmd, 1)); } -BOOL CIODispatcher::SendCommandByIndex(int idx, TDispCommand* pCmd) +BOOL CIODispatcher::CtlFD(FD fd, int op, UINT mask, PVOID pv) { - TDispContext& ctx = GetContextByIndex(idx); - return SendCommand(ctx, pCmd); -} - -BOOL CIODispatcher::SendCommandByFD(FD fd, USHORT t, UINT_PTR wp, UINT_PTR lp) -{ - return SendCommandByFD(fd, TDispCommand::Construct(t, wp, lp)); -} - -BOOL CIODispatcher::SendCommandByFD(FD fd, TDispCommand* pCmd) -{ - TDispContext& ctx = GetContextByFD(fd); - return SendCommand(ctx, pCmd); -} - -BOOL CIODispatcher::SendCommand(TDispContext& ctx, TDispCommand* pCmd) -{ - ctx.m_queue.PushBack(pCmd); - return VERIFY_IS_NO_ERROR(eventfd_write(ctx.m_evCmd, 1)); -} - -BOOL CIODispatcher::CtlFD(int idx, FD fd, int op, UINT mask, PVOID pv) -{ - const TDispContext& ctx = GetContext(idx, fd); - epoll_event evt = {mask, pv}; - return IS_NO_ERROR(epoll_ctl(ctx.m_epoll, op, fd, &evt)); + return IS_NO_ERROR(epoll_ctl(m_epoll, op, fd, &evt)); } -int CIODispatcher::WorkerProc(TDispContext* pContext) +int CIODispatcher::WorkerProc(PVOID pv) { ::SetSequenceThreadName(SELF_THREAD_ID, m_strPrefix, m_uiSeq); m_pHandler->OnDispatchThreadStart(SELF_THREAD_ID); - BOOL bRun = TRUE; - unique_ptr pEvents = make_unique(m_iMaxEvents); + BOOL bRun = TRUE; + unique_ptr pEvents = make_unique(m_iMaxEvents); while(bRun) { - int rs = NO_EINTR_INT(epoll_pwait(pContext->m_epoll, pEvents.get(), m_iMaxEvents, INFINITE, nullptr)); + int rs = NO_EINTR_INT(epoll_pwait(m_epoll, pEvents.get(), m_iMaxEvents, INFINITE, nullptr)); if(rs <= TIMEOUT) ERROR_ABORT(); @@ -214,12 +190,14 @@ int CIODispatcher::WorkerProc(TDispContext* pContext) UINT events = pEvents[i].events; PVOID ptr = pEvents[i].data.ptr; - if(ptr == &pContext->m_evCmd) - ProcessCommand(pContext, events); + if(ptr == &m_evCmd) + ProcessCommand(events); + else if(ptr == &m_evTimer) + ProcessTimer(events); else if(ptr == &m_evExit) - bRun = ProcessExit(pContext, events); + bRun = ProcessExit(events); else - ProcessIo(pContext, ptr, events); + ProcessIo(ptr, events); } } @@ -228,7 +206,7 @@ int CIODispatcher::WorkerProc(TDispContext* pContext) return 0; } -BOOL CIODispatcher::ProcessCommand(TDispContext* pContext, UINT events) +BOOL CIODispatcher::ProcessCommand(UINT events) { if(events & _EPOLL_ALL_ERROR_EVENTS) ERROR_ABORT(); @@ -240,7 +218,7 @@ BOOL CIODispatcher::ProcessCommand(TDispContext* pContext, UINT events) eventfd_t v; - int rs = eventfd_read(pContext->m_evCmd, &v); + int rs = eventfd_read(m_evCmd, &v); if(IS_NO_ERROR(rs)) { @@ -248,9 +226,9 @@ BOOL CIODispatcher::ProcessCommand(TDispContext* pContext, UINT events) TDispCommand* pCmd = nullptr; - while(pContext->m_queue.PopFront(&pCmd)) + while(m_queue.PopFront(&pCmd)) { - m_pHandler->OnCommand(pContext, pCmd); + m_pHandler->OnCommand(pCmd); TDispCommand::Destruct(pCmd); } } @@ -264,7 +242,26 @@ BOOL CIODispatcher::ProcessCommand(TDispContext* pContext, UINT events) return isOK; } -BOOL CIODispatcher::ProcessExit(const TDispContext* pContext, UINT events) +BOOL CIODispatcher::ProcessTimer(UINT events) +{ + if(events & _EPOLL_ALL_ERROR_EVENTS) + ERROR_ABORT(); + + if(!(events & EPOLLIN)) + return TRUE; + + BOOL isOK = FALSE; + ULLONG ullExpirations; + + if(::ReadTimer(m_evTimer, &ullExpirations, &isOK) && isOK) + m_pHandler->OnTimer(ullExpirations); + else + ASSERT(IS_WOULDBLOCK_ERROR()); + + return isOK; +} + +BOOL CIODispatcher::ProcessExit(UINT events) { if(events & _EPOLL_ALL_ERROR_EVENTS) ERROR_ABORT(); @@ -289,40 +286,40 @@ BOOL CIODispatcher::ProcessExit(const TDispContext* pContext, UINT events) return bRun; } -BOOL CIODispatcher::ProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CIODispatcher::ProcessIo(PVOID pv, UINT events) { - if(!m_pHandler->OnBeforeProcessIo(pContext, pv, events)) + if(!m_pHandler->OnBeforeProcessIo(pv, events)) return FALSE; - BOOL rs = DoProcessIo(pContext, pv, events); - m_pHandler->OnAfterProcessIo(pContext, pv, events, rs); + BOOL rs = DoProcessIo(pv, events); + m_pHandler->OnAfterProcessIo(pv, events, rs); return rs; } -BOOL CIODispatcher::DoProcessIo(const TDispContext* pContext, PVOID pv, UINT events) +BOOL CIODispatcher::DoProcessIo(PVOID pv, UINT events) { if(events & EPOLLERR) - return m_pHandler->OnError(pContext, pv, events); - if((events & EPOLLPRI) && !m_pHandler->OnReadyPrivilege(pContext, pv, events)) + return m_pHandler->OnError(pv, events); + if((events & EPOLLPRI) && !m_pHandler->OnReadyPrivilege(pv, events)) return FALSE; - if((events & EPOLLIN) && !m_pHandler->OnReadyRead(pContext, pv, events)) + if((events & EPOLLIN) && !m_pHandler->OnReadyRead(pv, events)) return FALSE; - if((events & EPOLLOUT) && !m_pHandler->OnReadyWrite(pContext, pv, events)) + if((events & EPOLLOUT) && !m_pHandler->OnReadyWrite(pv, events)) return FALSE; - if((events & (_EPOLL_HUNGUP_EVENTS)) && !m_pHandler->OnHungUp(pContext, pv, events)) + if((events & (_EPOLL_HUNGUP_EVENTS)) && !m_pHandler->OnHungUp(pv, events)) return FALSE; return TRUE; } -FD CIODispatcher::AddTimer(int idx, LLONG llInterval, PVOID pv) +FD CIODispatcher::AddTimer(LLONG llInterval, PVOID pv) { FD fdTimer = ::CreateTimer(llInterval); if(IS_VALID_FD(fdTimer)) { - if(!AddFD(idx, fdTimer, EPOLLIN | EPOLLET, pv)) + if(!AddFD(fdTimer, EPOLLIN | EPOLLET, pv)) { close(fdTimer); fdTimer = INVALID_FD; @@ -332,13 +329,13 @@ FD CIODispatcher::AddTimer(int idx, LLONG llInterval, PVOID pv) return fdTimer; } -BOOL CIODispatcher::DelTimer(int idx, FD fdTimer) +BOOL CIODispatcher::DelTimer(FD fdTimer) { BOOL isOK = FALSE; if(IS_VALID_FD(fdTimer)) { - if(DelFD(idx, fdTimer)) + if(DelFD(fdTimer)) isOK = TRUE; close(fdTimer); diff --git a/common/IODispatcher.h b/common/IODispatcher.h index 2bc6622..eb167d9 100644 --- a/common/IODispatcher.h +++ b/common/IODispatcher.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "RingBuffer.h" #include "Thread.h" @@ -48,61 +48,16 @@ using namespace std; #define _EPOLL_ALL_NORMAL_EVENTS (_EPOLL_NORMAL_RW_EVENTS | _EPOLL_ALL_ERROR_EVENTS) #define _EPOLL_ALL_EVENTS (_EPOLL_ALL_RW_EVENTS | _EPOLL_ALL_ERROR_EVENTS) -#define DISP_EVENT_FLAG_R 0x1 -#define DISP_EVENT_FLAG_W 0x2 -#define DISP_EVENT_FLAG_H 0x4 - +#define DISP_EVENT_FLAG_R 1 +#define DISP_EVENT_FLAG_W 2 +#define DISP_EVENT_FLAG_H 4 #define RETRIVE_EVENT_FLAG_R(evt) ((evt) & (_EPOLL_ALL_READ_EVENTS) ? DISP_EVENT_FLAG_R : 0) #define RETRIVE_EVENT_FLAG_W(evt) ((evt) & (_EPOLL_WRITE_EVENTS) ? DISP_EVENT_FLAG_W : 0) #define RETRIVE_EVENT_FLAG_RW(evt) (RETRIVE_EVENT_FLAG_R(evt) | RETRIVE_EVENT_FLAG_W(evt)) #define RETRIVE_EVENT_FLAG_H(evt) ((evt) & (_EPOLL_HUNGUP_EVENTS) ? DISP_EVENT_FLAG_H : 0) -#ifndef EPOLLEXCLUSIVE - #define EPOLLEXCLUSIVE (1u << 28) -#endif - -#define MAYBE_EPOLLEXCLUSIVE (::IsKernelVersionAbove(4, 5, 0) ? EPOLLEXCLUSIVE : 0) - // ------------------------------------------------------------------------------------------------------------------------------------------------------- // -struct TDispCommand; -class CIODispatcher; - -struct TDispContext -{ - friend class CIODispatcher; - - using CCommandQueue = CCASQueue; - using CWorkerThread = CThread; - -public: - int GetIndex() const {return m_iIndex;} - THR_ID GetThreadId() const {return m_pWorker != nullptr ? m_pWorker->GetThreadID() : 0;} - -public: - TDispContext() {Reset();} - ~TDispContext() = default; - - DECLARE_NO_COPY_CLASS(TDispContext) - -private: - VOID Reset() - { - m_iIndex = -1; - m_epoll = INVALID_FD; - m_evCmd = INVALID_FD; - m_pWorker = nullptr; - } - -private: - int m_iIndex; - FD m_epoll; - FD m_evCmd; - - CCommandQueue m_queue; - unique_ptr m_pWorker; -}; - struct TDispCommand { USHORT type; @@ -129,18 +84,20 @@ private: class IIOHandler { public: - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) = 0; - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) = 0; - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) = 0; - virtual BOOL OnReadyRead(const TDispContext* pContext, PVOID pv, UINT events) = 0; - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) = 0; - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) = 0; - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) = 0; - virtual BOOL OnReadyPrivilege(const TDispContext* pContext, PVOID pv, UINT events) = 0; + virtual VOID OnCommand(TDispCommand* pCmd) = 0; + virtual VOID OnTimer(ULLONG llExpirations) = 0; - virtual VOID OnDispatchThreadStart(THR_ID tid) = 0; - virtual VOID OnDispatchThreadEnd(THR_ID tid) = 0; + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) = 0; + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) = 0; + virtual BOOL OnReadyRead(PVOID pv, UINT events) = 0; + virtual BOOL OnReadyWrite(PVOID pv, UINT events) = 0; + virtual BOOL OnHungUp(PVOID pv, UINT events) = 0; + virtual BOOL OnError(PVOID pv, UINT events) = 0; + virtual BOOL OnReadyPrivilege(PVOID pv, UINT events) = 0; + + virtual VOID OnDispatchThreadStart(THR_ID tid) = 0; + virtual VOID OnDispatchThreadEnd(THR_ID tid) = 0; public: virtual ~IIOHandler() = default; @@ -149,17 +106,17 @@ public: class CIOHandler : public IIOHandler { public: - virtual VOID OnCommand(const TDispContext* pContext, TDispCommand* pCmd) override {} + virtual VOID OnCommand(TDispCommand* pCmd) override {} + virtual VOID OnTimer(ULLONG llExpirations) override {} - virtual BOOL OnBeforeProcessIo(const TDispContext* pContext, PVOID pv, UINT events) override {return TRUE;} - virtual VOID OnAfterProcessIo(const TDispContext* pContext, PVOID pv, UINT events, BOOL rs) override {} - virtual BOOL OnReadyWrite(const TDispContext* pContext, PVOID pv, UINT events) override {return TRUE;} - virtual BOOL OnHungUp(const TDispContext* pContext, PVOID pv, UINT events) override {return TRUE;} - virtual BOOL OnError(const TDispContext* pContext, PVOID pv, UINT events) override {return TRUE;} - virtual BOOL OnReadyPrivilege(const TDispContext* pContext, PVOID pv, UINT events) override {return TRUE;} - - virtual VOID OnDispatchThreadStart(THR_ID tid) override {} - virtual VOID OnDispatchThreadEnd(THR_ID tid) override {} + virtual BOOL OnBeforeProcessIo(PVOID pv, UINT events) override {return TRUE;} + virtual VOID OnAfterProcessIo(PVOID pv, UINT events, BOOL rs) override {} + virtual BOOL OnReadyWrite(PVOID pv, UINT events) override {return TRUE;} + virtual BOOL OnHungUp(PVOID pv, UINT events) override {return TRUE;} + virtual BOOL OnError(PVOID pv, UINT events) override {return TRUE;} + virtual BOOL OnReadyPrivilege(PVOID pv, UINT events) override {return TRUE;} + virtual VOID OnDispatchThreadStart(THR_ID tid) override {} + virtual VOID OnDispatchThreadEnd(THR_ID tid) override {} }; // ------------------------------------------------------------------------------------------------------------------------------------------------------- // @@ -169,91 +126,55 @@ class CIODispatcher public: static const int DEF_WORKER_MAX_EVENTS = 64; - using CCommandQueue = TDispContext::CCommandQueue; - using CWorkerThread = TDispContext::CWorkerThread; + using CCommandQueue = CCASQueue; + using CWorkerThread = CThread; public: - BOOL Start(IIOHandler* pHandler, int iWorkerMaxEvents = DEF_WORKER_MAX_EVENTS, int iWorkers = 0); + BOOL Start(IIOHandler* pHandler, int iWorkerMaxEvents = DEF_WORKER_MAX_EVENTS, int iWorkers = 0, LLONG llTimerInterval = 0); BOOL Stop(BOOL bCheck = TRUE); - BOOL SendCommandByIndex(int idx, TDispCommand* pCmd); - BOOL SendCommandByIndex(int idx, USHORT t, UINT_PTR wp = 0, UINT_PTR lp = 0); - BOOL SendCommandByFD(FD fd, TDispCommand* pCmd); - BOOL SendCommandByFD(FD fd, USHORT t, UINT_PTR wp = 0, UINT_PTR lp = 0); - BOOL SendCommand(TDispContext& ctx, TDispCommand* pCmd); + BOOL SendCommand(TDispCommand* pCmd); + BOOL SendCommand(USHORT t, UINT_PTR wp = 0, UINT_PTR lp = 0); template, TDispCommand*>::value>> - BOOL SendCommandsByIndex(int idx, const _List& cmds) - { - TDispContext& ctx = GetContextByIndex(idx); - return SendCommands(ctx, cmds); - } - - template, TDispCommand*>::value>> - BOOL SendCommandsByFD(FD fd, const _List& cmds) - { - TDispContext& ctx = GetContextByFD(fd); - return SendCommands(ctx, cmds); - } - - template, TDispCommand*>::value>> - BOOL SendCommands(TDispContext& ctx, const _List& cmds) + BOOL SendCommands(const _List& cmds) { size_t size = cmds.size(); if(size == 0) return FALSE; for(auto it = cmds.begin(), end = cmds.end(); it != end; ++it) - ctx.m_queue.PushBack(*it); + m_queue.PushBack(*it); - return VERIFY_IS_NO_ERROR(eventfd_write(ctx.m_evCmd, size)); + return VERIFY_IS_NO_ERROR(eventfd_write(m_evCmd, size)); } - BOOL AddFD(int idx, FD fd, UINT mask, PVOID pv) {return CtlFD(idx, fd, EPOLL_CTL_ADD, mask, pv);} - BOOL ModFD(int idx, FD fd, UINT mask, PVOID pv) {return CtlFD(idx, fd, EPOLL_CTL_MOD, mask, pv);} - BOOL DelFD(int idx, FD fd) {return CtlFD(idx, fd, EPOLL_CTL_DEL, 0, nullptr);} - BOOL CtlFD(int idx, FD fd, int op, UINT mask, PVOID pv); + BOOL AddFD(FD fd, UINT mask, PVOID pv) {return CtlFD(fd, EPOLL_CTL_ADD, mask, pv);} + BOOL ModFD(FD fd, UINT mask, PVOID pv) {return CtlFD(fd, EPOLL_CTL_MOD, mask, pv);} + BOOL DelFD(FD fd) {return CtlFD(fd, EPOLL_CTL_DEL, 0, nullptr);} + BOOL CtlFD(FD fd, int op, UINT mask, PVOID pv); + BOOL ProcessIo(PVOID pv, UINT events); - BOOL AddFD(FD fd, UINT mask, PVOID pv) {return CtlFD(-1, fd, EPOLL_CTL_ADD, mask, pv);} - BOOL ModFD(FD fd, UINT mask, PVOID pv) {return CtlFD(-1, fd, EPOLL_CTL_MOD, mask, pv);} - BOOL DelFD(FD fd) {return CtlFD(-1, fd, EPOLL_CTL_DEL, 0, nullptr);} - BOOL CtlFD(FD fd, int op, UINT mask, PVOID pv) {return CtlFD(-1, fd, op, mask, pv);} - - BOOL ProcessIo(const TDispContext* pContext, PVOID pv, UINT events); - - FD AddTimer (int idx, LLONG llInterval, PVOID pv); - BOOL DelTimer (int idx, FD fdTimer); - - FD AddTimer (LLONG llInterval, PVOID pv) {return AddTimer(-1, llInterval, pv);} - BOOL DelTimer (FD fdTimer) {return DelTimer(-1, fdTimer);} + FD AddTimer (LLONG llInterval, PVOID pv); + BOOL DelTimer (FD fdTimer); private: - int WorkerProc(TDispContext* pContext); - BOOL ProcessExit(const TDispContext* pContext, UINT events); - BOOL ProcessCommand(TDispContext* pContext, UINT events); - BOOL DoProcessIo(const TDispContext* pContext, PVOID pv, UINT events); + int WorkerProc(PVOID pv = nullptr); + BOOL ProcessExit(UINT events); + BOOL ProcessTimer(UINT events); + BOOL ProcessCommand(UINT events); + BOOL DoProcessIo(PVOID pv, UINT events); VOID Reset(); VOID MakePrefix(); - TDispContext& GetContextByIndex(int idx) {return GetContext(idx, -1);} - TDispContext& GetContextByFD(FD fd) {return GetContext(-1, fd);} - TDispContext& GetContext(int idx, FD fd); - public: - const TDispContext& GetContextRefByIndex(int idx) {return GetContextByIndex(idx);} - const TDispContext& GetContextRefByFD(FD fd) {return GetContextByFD(fd);} - const TDispContext& GetContextRef(int idx, FD fd) {return GetContext(idx, fd);} - - BOOL HasStarted() {return m_pHandler && m_pContexts;} - int GetWorkers() {return m_iWorkers;} - const TDispContext* GetContexts() {return m_pContexts.get();} + BOOL HasStarted() {return m_pHandler && m_pWorkers;} + const CWorkerThread* GetWorkerThreads() {return m_pWorkers.get();} CIODispatcher() {MakePrefix(); Reset();} ~CIODispatcher() {if(HasStarted()) Stop();} - DECLARE_NO_COPY_CLASS(CIODispatcher) - private: static LPCTSTR WORKER_THREAD_PREFIX; static volatile UINT sm_uiNum; @@ -262,11 +183,14 @@ private: CString m_strPrefix; private: - int m_iWorkers; - int m_iMaxEvents; + IIOHandler* m_pHandler; + FD m_epoll; + FD m_evCmd; + FD m_evExit; + FD m_evTimer; + int m_iWorkers; + int m_iMaxEvents; - FD m_evExit; - - IIOHandler* m_pHandler; - unique_ptr m_pContexts; + CCommandQueue m_queue; + unique_ptr m_pWorkers; }; diff --git a/common/PollHelper.h b/common/PollHelper.h index d06119c..35f359a 100644 --- a/common/PollHelper.h +++ b/common/PollHelper.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include #include diff --git a/common/PrivateHeap.h b/common/PrivateHeap.h index b865cf5..2671a47 100644 --- a/common/PrivateHeap.h +++ b/common/PrivateHeap.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include diff --git a/common/RWLock.h b/common/RWLock.h index 8294056..1ed483a 100644 --- a/common/RWLock.h +++ b/common/RWLock.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "CriSec.h" #include diff --git a/common/RingBuffer.h b/common/RingBuffer.h index 3b9b281..6445232 100644 --- a/common/RingBuffer.h +++ b/common/RingBuffer.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "STLHelper.h" #include "FuncHelper.h" diff --git a/common/STLHelper.h b/common/STLHelper.h index 675e514..d763eb9 100644 --- a/common/STLHelper.h +++ b/common/STLHelper.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Singleton.h" #include "StringT.h" @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -1018,51 +1017,3 @@ typedef str_sort_func tchar_ptr_desc_case_sort_func; typedef str_sort_func string_desc_case_sort_func; typedef str_sort_func tchar_ptr_desc_ucase_sort_func; typedef str_sort_func string_desc_ucase_sort_func; - -template::value>> -class CRandomIntegralT -{ -public: - _IntType Generate() {return dist(gen);} - _IntType operator()() {return Generate();} - -public: - CRandomIntegralT(_IntType from, _IntType to) : gen(rd()), dist(from, to) - { - - } - -private: - random_device rd; - mt19937 gen; - uniform_int_distribution<_IntType> dist; -}; - -template::value>> -class CRandomRealTypeT -{ -public: - _RealType Generate() {return dist(gen);} - _RealType operator()() {return Generate();} - -public: - CRandomRealTypeT(_RealType from, _RealType to) : gen(rd()), dist(from, to) - { - - } - -private: - random_device rd; - mt19937 gen; - uniform_real_distribution<_RealType> dist; -}; - -typedef CRandomIntegralT CRandomInt; -typedef CRandomIntegralT CRandomLong; -typedef CRandomIntegralT CRandomUint; -typedef CRandomIntegralT CRandomUlong; -typedef CRandomIntegralT CRandomInt64; -typedef CRandomIntegralT CRandomUint64; - -typedef CRandomRealTypeT CRandomFloat; -typedef CRandomRealTypeT CRandomDouble; diff --git a/common/Semaphore.h b/common/Semaphore.h index 0d897f8..3dcee56 100644 --- a/common/Semaphore.h +++ b/common/Semaphore.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "CriSec.h" #include diff --git a/common/SignalHandler.h b/common/SignalHandler.h index dd44ce2..62584e6 100644 --- a/common/SignalHandler.h +++ b/common/SignalHandler.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include "Thread.h" #include diff --git a/common/Singleton.h b/common/Singleton.h index 81592a3..f593816 100644 --- a/common/Singleton.h +++ b/common/Singleton.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #define SINGLETON_THIS(ClassName) ClassName::GetThis() #define SINGLETON_INSTANCE(ClassName) ClassName::GetInstance() diff --git a/common/SysHelper.h b/common/SysHelper.h index 4a35e12..49957bd 100644 --- a/common/SysHelper.h +++ b/common/SysHelper.h @@ -23,7 +23,7 @@ #pragma once -#include "hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalDef.h" #include #include @@ -49,9 +49,6 @@ using namespace std; /* 默认内存块缓存池回收阀值 */ #define DEFAULT_BUFFER_CACHE_POOL_HOLD 1024 -/* 使用外部垃圾回收 */ -#define USE_EXTERNAL_GC 1 - #define SysGetSystemConfig sysconf #define SysGetSystemInfo sysinfo diff --git a/common/Thread.h b/common/Thread.h index d070bc8..3ec747e 100644 --- a/common/Thread.h +++ b/common/Thread.h @@ -23,8 +23,8 @@ #pragma once -#include "hpsocket/GlobalDef.h" -#include "hpsocket/GlobalErrno.h" +#include "../hpsocket/GlobalDef.h" +#include "../hpsocket/GlobalErrno.h" #include "RWLock.h" #include "STLHelper.h" diff --git a/common/crypto/Crypto.cpp b/common/crypto/Crypto.cpp new file mode 100644 index 0000000..4f0d414 --- /dev/null +++ b/common/crypto/Crypto.cpp @@ -0,0 +1,2374 @@ +#include "Crypto.h" + +#include +#include + +#ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wconversion" +#endif + +/****************************** MACROS ******************************/ + +#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b)))) +#define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b)))) + +// -------------------------------------------------- BASE64 -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define NEWLINE_INVL 76 + +/**************************** VARIABLES *****************************/ +// Note: To change the charset to a URL encoding, replace the '+' and '/' with '*' and '-' +static const BYTE charset[]={"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"}; + +/*********************** FUNCTION DEFINITIONS ***********************/ +BYTE revchar(char ch) +{ + if (ch >= 'A' && ch <= 'Z') + ch -= 'A'; + else if (ch >= 'a' && ch <='z') + ch = ch - 'a' + 26; + else if (ch >= '0' && ch <='9') + ch = ch - '0' + 52; + else if (ch == '+') + ch = 62; + else if (ch == '/') + ch = 63; + + return(ch); +} + +size_t base64_encode(const BYTE in[], BYTE out[], size_t len, int newline_flag) +{ + size_t idx, idx2, blks, blk_ceiling, left_over, newline_count = 0; + + blks = (len / 3); + left_over = len % 3; + + if (out == nullptr) { + idx2 = blks * 4 ; + if (left_over) + idx2 += 4; + if (newline_flag) + idx2 += len / 57; // (NEWLINE_INVL / 4) * 3 = 57. One newline per 57 input bytes. + } + else { + // Since 3 input bytes = 4 output bytes, determine out how many even sets of + // 3 bytes the input has. + blk_ceiling = blks * 3; + for (idx = 0, idx2 = 0; idx < blk_ceiling; idx += 3, idx2 += 4) { + out[idx2] = charset[in[idx] >> 2]; + out[idx2 + 1] = charset[((in[idx] & 0x03) << 4) | (in[idx + 1] >> 4)]; + out[idx2 + 2] = charset[((in[idx + 1] & 0x0f) << 2) | (in[idx + 2] >> 6)]; + out[idx2 + 3] = charset[in[idx + 2] & 0x3F]; + // The offical standard requires a newline every 76 characters. + // (Eg, first newline is character 77 of the output.) + if (((idx2 - newline_count + 4) % NEWLINE_INVL == 0) && newline_flag) { + out[idx2 + 4] = '\n'; + idx2++; + newline_count++; + } + } + + if (left_over == 1) { + out[idx2] = charset[in[idx] >> 2]; + out[idx2 + 1] = charset[(in[idx] & 0x03) << 4]; + out[idx2 + 2] = '='; + out[idx2 + 3] = '='; + idx2 += 4; + } + else if (left_over == 2) { + out[idx2] = charset[in[idx] >> 2]; + out[idx2 + 1] = charset[((in[idx] & 0x03) << 4) | (in[idx + 1] >> 4)]; + out[idx2 + 2] = charset[(in[idx + 1] & 0x0F) << 2]; + out[idx2 + 3] = '='; + idx2 += 4; + } + } + + return(idx2); +} + +size_t base64_decode(const BYTE in[], BYTE out[], size_t len) +{ + size_t idx, idx2, blks, blk_ceiling, left_over; + + if (in[len - 1] == '=') + len--; + if (in[len - 1] == '=') + len--; + + blks = len / 4; + left_over = len % 4; + + if (out == nullptr) { + if (len >= 77 && in[NEWLINE_INVL] == '\n') // Verify that newlines where used. + len -= len / (NEWLINE_INVL + 1); + blks = len / 4; + left_over = len % 4; + + idx = blks * 3; + if (left_over == 2) + idx ++; + else if (left_over == 3) + idx += 2; + } + else { + blk_ceiling = blks * 4; + for (idx = 0, idx2 = 0; idx2 < blk_ceiling; idx += 3, idx2 += 4) { + if (in[idx2] == '\n') + idx2++; + out[idx] = (revchar(in[idx2]) << 2) | ((revchar(in[idx2 + 1]) & 0x30) >> 4); + out[idx + 1] = (revchar(in[idx2 + 1]) << 4) | (revchar(in[idx2 + 2]) >> 2); + out[idx + 2] = (revchar(in[idx2 + 2]) << 6) | revchar(in[idx2 + 3]); + } + + if (left_over == 2) { + out[idx] = (revchar(in[idx2]) << 2) | ((revchar(in[idx2 + 1]) & 0x30) >> 4); + idx++; + } + else if (left_over == 3) { + out[idx] = (revchar(in[idx2]) << 2) | ((revchar(in[idx2 + 1]) & 0x30) >> 4); + out[idx + 1] = (revchar(in[idx2 + 1]) << 4) | (revchar(in[idx2 + 2]) >> 2); + idx += 2; + } + } + + return(idx); +} + +// -------------------------------------------------- URL -------------------------------------------------- // + +#define HEX_CHAR_TO_VALUE(c) (c <= '9' ? c - '0' : (c <= 'F' ? c - 'A' + 0x0A : c - 'a' + 0X0A)) +#define HEX_DOUBLE_CHAR_TO_VALUE(pc) (((HEX_CHAR_TO_VALUE(*(pc))) << 4) | (HEX_CHAR_TO_VALUE(*(pc + 1)))) +#define HEX_VALUE_TO_CHAR(n) (n <= 9 ? n + '0' : (n <= 'F' ? n + 'A' - 0X0A : n + 'a' - 0X0A)) +#define HEX_VALUE_TO_DOUBLE_CHAR(pc, n) {*(pc) = HEX_VALUE_TO_CHAR((n >> 4)); *((pc) + 1) = HEX_VALUE_TO_CHAR((n & 0X0F));} + +int url_encode(const char* src, const int src_size, char* dest, const int dest_size) +{ + if(src == nullptr || dest == nullptr || src_size <= 0 || dest_size <= 0) + return 0; + + char ch; + int j = 0; + + for(int i = 0; (i < src_size) && (j < dest_size); ++i) + { + ch = src[i]; + + if (((ch>='A') && (ch<'Z')) || + ((ch>='a') && (ch<'z')) || + ((ch>='0') && (ch<'9')) || + (ch == '.' || ch == '-' || ch == '_' || ch == '*')) + dest[j++] = ch; + else if(ch == ' ') + dest[j++] = '+'; + else { + if(j + 3 < dest_size) + { + dest[j++] = '%'; + HEX_VALUE_TO_DOUBLE_CHAR(dest + j, ch); + j += 2; + } + else + return 0; + } + } + + dest[j] = '\0'; + return j; +} + +int url_decode(const char* src, const int src_size, char* dest, const int dest_size) +{ + if(src == nullptr || dest == nullptr || src_size <= 0 || dest_size <= 0) + return 0; + + char ch; + int j = 0; + + for(int i = 0; i < src_size && j < dest_size; ++i) + { + ch = src[i]; + + if(ch == '+') + dest[j++] = ' '; + else if(ch == '%') + { + if(i + 2 < src_size) + { + dest[j++] = HEX_DOUBLE_CHAR_TO_VALUE(src + i + 1); + i += 2; + } + } + else + dest[j++] = ch; + } + + dest[j] = 0; + return j; +} + +// -------------------------------------------------- AES -------------------------------------------------- // + +/****************************** MACROS ******************************/ +// The least significant byte of the word is rotated to the end. +#define KE_ROTWORD(x) (((x) << 8) | ((x) >> 24)) + +/**************************** DATA TYPES ****************************/ +#define AES_128_ROUNDS 10 +#define AES_192_ROUNDS 12 +#define AES_256_ROUNDS 14 + +/*********************** FUNCTION DECLARATIONS **********************/ +void ccm_prepare_first_ctr_blk(BYTE counter[], const BYTE nonce[], int nonce_len, int payload_len_store_size); +void ccm_prepare_first_format_blk(BYTE buf[], int assoc_len, int payload_len, int payload_len_store_size, int mac_len, const BYTE nonce[], int nonce_len); +void ccm_format_assoc_data(BYTE buf[], int *end_of_buf, const BYTE assoc[], int assoc_len); +void ccm_format_payload_data(BYTE buf[], int *end_of_buf, const BYTE payload[], int payload_len); + +/**************************** VARIABLES *****************************/ +// This is the specified AES SBox. To look up a substitution value, put the first +// nibble in the first index (row) and the second nibble in the second index (column). +static const BYTE aes_sbox[16][16] = { + {0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76}, + {0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0}, + {0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15}, + {0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75}, + {0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84}, + {0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF}, + {0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8}, + {0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2}, + {0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73}, + {0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB}, + {0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79}, + {0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08}, + {0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A}, + {0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E}, + {0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF}, + {0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16} +}; + +static const BYTE aes_invsbox[16][16] = { + {0x52,0x09,0x6A,0xD5,0x30,0x36,0xA5,0x38,0xBF,0x40,0xA3,0x9E,0x81,0xF3,0xD7,0xFB}, + {0x7C,0xE3,0x39,0x82,0x9B,0x2F,0xFF,0x87,0x34,0x8E,0x43,0x44,0xC4,0xDE,0xE9,0xCB}, + {0x54,0x7B,0x94,0x32,0xA6,0xC2,0x23,0x3D,0xEE,0x4C,0x95,0x0B,0x42,0xFA,0xC3,0x4E}, + {0x08,0x2E,0xA1,0x66,0x28,0xD9,0x24,0xB2,0x76,0x5B,0xA2,0x49,0x6D,0x8B,0xD1,0x25}, + {0x72,0xF8,0xF6,0x64,0x86,0x68,0x98,0x16,0xD4,0xA4,0x5C,0xCC,0x5D,0x65,0xB6,0x92}, + {0x6C,0x70,0x48,0x50,0xFD,0xED,0xB9,0xDA,0x5E,0x15,0x46,0x57,0xA7,0x8D,0x9D,0x84}, + {0x90,0xD8,0xAB,0x00,0x8C,0xBC,0xD3,0x0A,0xF7,0xE4,0x58,0x05,0xB8,0xB3,0x45,0x06}, + {0xD0,0x2C,0x1E,0x8F,0xCA,0x3F,0x0F,0x02,0xC1,0xAF,0xBD,0x03,0x01,0x13,0x8A,0x6B}, + {0x3A,0x91,0x11,0x41,0x4F,0x67,0xDC,0xEA,0x97,0xF2,0xCF,0xCE,0xF0,0xB4,0xE6,0x73}, + {0x96,0xAC,0x74,0x22,0xE7,0xAD,0x35,0x85,0xE2,0xF9,0x37,0xE8,0x1C,0x75,0xDF,0x6E}, + {0x47,0xF1,0x1A,0x71,0x1D,0x29,0xC5,0x89,0x6F,0xB7,0x62,0x0E,0xAA,0x18,0xBE,0x1B}, + {0xFC,0x56,0x3E,0x4B,0xC6,0xD2,0x79,0x20,0x9A,0xDB,0xC0,0xFE,0x78,0xCD,0x5A,0xF4}, + {0x1F,0xDD,0xA8,0x33,0x88,0x07,0xC7,0x31,0xB1,0x12,0x10,0x59,0x27,0x80,0xEC,0x5F}, + {0x60,0x51,0x7F,0xA9,0x19,0xB5,0x4A,0x0D,0x2D,0xE5,0x7A,0x9F,0x93,0xC9,0x9C,0xEF}, + {0xA0,0xE0,0x3B,0x4D,0xAE,0x2A,0xF5,0xB0,0xC8,0xEB,0xBB,0x3C,0x83,0x53,0x99,0x61}, + {0x17,0x2B,0x04,0x7E,0xBA,0x77,0xD6,0x26,0xE1,0x69,0x14,0x63,0x55,0x21,0x0C,0x7D} +}; + +// This table stores pre-calculated values for all possible GF(2^8) calculations.This +// table is only used by the (Inv)MixColumns steps. +// USAGE: The second index (column) is the coefficient of multiplication. Only 7 different +// coefficients are used: 0x01, 0x02, 0x03, 0x09, 0x0b, 0x0d, 0x0e, but multiplication by +// 1 is negligible leaving only 6 coefficients. Each column of the table is devoted to one +// of these coefficients, in the ascending order of value, from values 0x00 to 0xFF. +static const BYTE gf_mul[256][6] = { + {0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x03,0x09,0x0b,0x0d,0x0e}, + {0x04,0x06,0x12,0x16,0x1a,0x1c},{0x06,0x05,0x1b,0x1d,0x17,0x12}, + {0x08,0x0c,0x24,0x2c,0x34,0x38},{0x0a,0x0f,0x2d,0x27,0x39,0x36}, + {0x0c,0x0a,0x36,0x3a,0x2e,0x24},{0x0e,0x09,0x3f,0x31,0x23,0x2a}, + {0x10,0x18,0x48,0x58,0x68,0x70},{0x12,0x1b,0x41,0x53,0x65,0x7e}, + {0x14,0x1e,0x5a,0x4e,0x72,0x6c},{0x16,0x1d,0x53,0x45,0x7f,0x62}, + {0x18,0x14,0x6c,0x74,0x5c,0x48},{0x1a,0x17,0x65,0x7f,0x51,0x46}, + {0x1c,0x12,0x7e,0x62,0x46,0x54},{0x1e,0x11,0x77,0x69,0x4b,0x5a}, + {0x20,0x30,0x90,0xb0,0xd0,0xe0},{0x22,0x33,0x99,0xbb,0xdd,0xee}, + {0x24,0x36,0x82,0xa6,0xca,0xfc},{0x26,0x35,0x8b,0xad,0xc7,0xf2}, + {0x28,0x3c,0xb4,0x9c,0xe4,0xd8},{0x2a,0x3f,0xbd,0x97,0xe9,0xd6}, + {0x2c,0x3a,0xa6,0x8a,0xfe,0xc4},{0x2e,0x39,0xaf,0x81,0xf3,0xca}, + {0x30,0x28,0xd8,0xe8,0xb8,0x90},{0x32,0x2b,0xd1,0xe3,0xb5,0x9e}, + {0x34,0x2e,0xca,0xfe,0xa2,0x8c},{0x36,0x2d,0xc3,0xf5,0xaf,0x82}, + {0x38,0x24,0xfc,0xc4,0x8c,0xa8},{0x3a,0x27,0xf5,0xcf,0x81,0xa6}, + {0x3c,0x22,0xee,0xd2,0x96,0xb4},{0x3e,0x21,0xe7,0xd9,0x9b,0xba}, + {0x40,0x60,0x3b,0x7b,0xbb,0xdb},{0x42,0x63,0x32,0x70,0xb6,0xd5}, + {0x44,0x66,0x29,0x6d,0xa1,0xc7},{0x46,0x65,0x20,0x66,0xac,0xc9}, + {0x48,0x6c,0x1f,0x57,0x8f,0xe3},{0x4a,0x6f,0x16,0x5c,0x82,0xed}, + {0x4c,0x6a,0x0d,0x41,0x95,0xff},{0x4e,0x69,0x04,0x4a,0x98,0xf1}, + {0x50,0x78,0x73,0x23,0xd3,0xab},{0x52,0x7b,0x7a,0x28,0xde,0xa5}, + {0x54,0x7e,0x61,0x35,0xc9,0xb7},{0x56,0x7d,0x68,0x3e,0xc4,0xb9}, + {0x58,0x74,0x57,0x0f,0xe7,0x93},{0x5a,0x77,0x5e,0x04,0xea,0x9d}, + {0x5c,0x72,0x45,0x19,0xfd,0x8f},{0x5e,0x71,0x4c,0x12,0xf0,0x81}, + {0x60,0x50,0xab,0xcb,0x6b,0x3b},{0x62,0x53,0xa2,0xc0,0x66,0x35}, + {0x64,0x56,0xb9,0xdd,0x71,0x27},{0x66,0x55,0xb0,0xd6,0x7c,0x29}, + {0x68,0x5c,0x8f,0xe7,0x5f,0x03},{0x6a,0x5f,0x86,0xec,0x52,0x0d}, + {0x6c,0x5a,0x9d,0xf1,0x45,0x1f},{0x6e,0x59,0x94,0xfa,0x48,0x11}, + {0x70,0x48,0xe3,0x93,0x03,0x4b},{0x72,0x4b,0xea,0x98,0x0e,0x45}, + {0x74,0x4e,0xf1,0x85,0x19,0x57},{0x76,0x4d,0xf8,0x8e,0x14,0x59}, + {0x78,0x44,0xc7,0xbf,0x37,0x73},{0x7a,0x47,0xce,0xb4,0x3a,0x7d}, + {0x7c,0x42,0xd5,0xa9,0x2d,0x6f},{0x7e,0x41,0xdc,0xa2,0x20,0x61}, + {0x80,0xc0,0x76,0xf6,0x6d,0xad},{0x82,0xc3,0x7f,0xfd,0x60,0xa3}, + {0x84,0xc6,0x64,0xe0,0x77,0xb1},{0x86,0xc5,0x6d,0xeb,0x7a,0xbf}, + {0x88,0xcc,0x52,0xda,0x59,0x95},{0x8a,0xcf,0x5b,0xd1,0x54,0x9b}, + {0x8c,0xca,0x40,0xcc,0x43,0x89},{0x8e,0xc9,0x49,0xc7,0x4e,0x87}, + {0x90,0xd8,0x3e,0xae,0x05,0xdd},{0x92,0xdb,0x37,0xa5,0x08,0xd3}, + {0x94,0xde,0x2c,0xb8,0x1f,0xc1},{0x96,0xdd,0x25,0xb3,0x12,0xcf}, + {0x98,0xd4,0x1a,0x82,0x31,0xe5},{0x9a,0xd7,0x13,0x89,0x3c,0xeb}, + {0x9c,0xd2,0x08,0x94,0x2b,0xf9},{0x9e,0xd1,0x01,0x9f,0x26,0xf7}, + {0xa0,0xf0,0xe6,0x46,0xbd,0x4d},{0xa2,0xf3,0xef,0x4d,0xb0,0x43}, + {0xa4,0xf6,0xf4,0x50,0xa7,0x51},{0xa6,0xf5,0xfd,0x5b,0xaa,0x5f}, + {0xa8,0xfc,0xc2,0x6a,0x89,0x75},{0xaa,0xff,0xcb,0x61,0x84,0x7b}, + {0xac,0xfa,0xd0,0x7c,0x93,0x69},{0xae,0xf9,0xd9,0x77,0x9e,0x67}, + {0xb0,0xe8,0xae,0x1e,0xd5,0x3d},{0xb2,0xeb,0xa7,0x15,0xd8,0x33}, + {0xb4,0xee,0xbc,0x08,0xcf,0x21},{0xb6,0xed,0xb5,0x03,0xc2,0x2f}, + {0xb8,0xe4,0x8a,0x32,0xe1,0x05},{0xba,0xe7,0x83,0x39,0xec,0x0b}, + {0xbc,0xe2,0x98,0x24,0xfb,0x19},{0xbe,0xe1,0x91,0x2f,0xf6,0x17}, + {0xc0,0xa0,0x4d,0x8d,0xd6,0x76},{0xc2,0xa3,0x44,0x86,0xdb,0x78}, + {0xc4,0xa6,0x5f,0x9b,0xcc,0x6a},{0xc6,0xa5,0x56,0x90,0xc1,0x64}, + {0xc8,0xac,0x69,0xa1,0xe2,0x4e},{0xca,0xaf,0x60,0xaa,0xef,0x40}, + {0xcc,0xaa,0x7b,0xb7,0xf8,0x52},{0xce,0xa9,0x72,0xbc,0xf5,0x5c}, + {0xd0,0xb8,0x05,0xd5,0xbe,0x06},{0xd2,0xbb,0x0c,0xde,0xb3,0x08}, + {0xd4,0xbe,0x17,0xc3,0xa4,0x1a},{0xd6,0xbd,0x1e,0xc8,0xa9,0x14}, + {0xd8,0xb4,0x21,0xf9,0x8a,0x3e},{0xda,0xb7,0x28,0xf2,0x87,0x30}, + {0xdc,0xb2,0x33,0xef,0x90,0x22},{0xde,0xb1,0x3a,0xe4,0x9d,0x2c}, + {0xe0,0x90,0xdd,0x3d,0x06,0x96},{0xe2,0x93,0xd4,0x36,0x0b,0x98}, + {0xe4,0x96,0xcf,0x2b,0x1c,0x8a},{0xe6,0x95,0xc6,0x20,0x11,0x84}, + {0xe8,0x9c,0xf9,0x11,0x32,0xae},{0xea,0x9f,0xf0,0x1a,0x3f,0xa0}, + {0xec,0x9a,0xeb,0x07,0x28,0xb2},{0xee,0x99,0xe2,0x0c,0x25,0xbc}, + {0xf0,0x88,0x95,0x65,0x6e,0xe6},{0xf2,0x8b,0x9c,0x6e,0x63,0xe8}, + {0xf4,0x8e,0x87,0x73,0x74,0xfa},{0xf6,0x8d,0x8e,0x78,0x79,0xf4}, + {0xf8,0x84,0xb1,0x49,0x5a,0xde},{0xfa,0x87,0xb8,0x42,0x57,0xd0}, + {0xfc,0x82,0xa3,0x5f,0x40,0xc2},{0xfe,0x81,0xaa,0x54,0x4d,0xcc}, + {0x1b,0x9b,0xec,0xf7,0xda,0x41},{0x19,0x98,0xe5,0xfc,0xd7,0x4f}, + {0x1f,0x9d,0xfe,0xe1,0xc0,0x5d},{0x1d,0x9e,0xf7,0xea,0xcd,0x53}, + {0x13,0x97,0xc8,0xdb,0xee,0x79},{0x11,0x94,0xc1,0xd0,0xe3,0x77}, + {0x17,0x91,0xda,0xcd,0xf4,0x65},{0x15,0x92,0xd3,0xc6,0xf9,0x6b}, + {0x0b,0x83,0xa4,0xaf,0xb2,0x31},{0x09,0x80,0xad,0xa4,0xbf,0x3f}, + {0x0f,0x85,0xb6,0xb9,0xa8,0x2d},{0x0d,0x86,0xbf,0xb2,0xa5,0x23}, + {0x03,0x8f,0x80,0x83,0x86,0x09},{0x01,0x8c,0x89,0x88,0x8b,0x07}, + {0x07,0x89,0x92,0x95,0x9c,0x15},{0x05,0x8a,0x9b,0x9e,0x91,0x1b}, + {0x3b,0xab,0x7c,0x47,0x0a,0xa1},{0x39,0xa8,0x75,0x4c,0x07,0xaf}, + {0x3f,0xad,0x6e,0x51,0x10,0xbd},{0x3d,0xae,0x67,0x5a,0x1d,0xb3}, + {0x33,0xa7,0x58,0x6b,0x3e,0x99},{0x31,0xa4,0x51,0x60,0x33,0x97}, + {0x37,0xa1,0x4a,0x7d,0x24,0x85},{0x35,0xa2,0x43,0x76,0x29,0x8b}, + {0x2b,0xb3,0x34,0x1f,0x62,0xd1},{0x29,0xb0,0x3d,0x14,0x6f,0xdf}, + {0x2f,0xb5,0x26,0x09,0x78,0xcd},{0x2d,0xb6,0x2f,0x02,0x75,0xc3}, + {0x23,0xbf,0x10,0x33,0x56,0xe9},{0x21,0xbc,0x19,0x38,0x5b,0xe7}, + {0x27,0xb9,0x02,0x25,0x4c,0xf5},{0x25,0xba,0x0b,0x2e,0x41,0xfb}, + {0x5b,0xfb,0xd7,0x8c,0x61,0x9a},{0x59,0xf8,0xde,0x87,0x6c,0x94}, + {0x5f,0xfd,0xc5,0x9a,0x7b,0x86},{0x5d,0xfe,0xcc,0x91,0x76,0x88}, + {0x53,0xf7,0xf3,0xa0,0x55,0xa2},{0x51,0xf4,0xfa,0xab,0x58,0xac}, + {0x57,0xf1,0xe1,0xb6,0x4f,0xbe},{0x55,0xf2,0xe8,0xbd,0x42,0xb0}, + {0x4b,0xe3,0x9f,0xd4,0x09,0xea},{0x49,0xe0,0x96,0xdf,0x04,0xe4}, + {0x4f,0xe5,0x8d,0xc2,0x13,0xf6},{0x4d,0xe6,0x84,0xc9,0x1e,0xf8}, + {0x43,0xef,0xbb,0xf8,0x3d,0xd2},{0x41,0xec,0xb2,0xf3,0x30,0xdc}, + {0x47,0xe9,0xa9,0xee,0x27,0xce},{0x45,0xea,0xa0,0xe5,0x2a,0xc0}, + {0x7b,0xcb,0x47,0x3c,0xb1,0x7a},{0x79,0xc8,0x4e,0x37,0xbc,0x74}, + {0x7f,0xcd,0x55,0x2a,0xab,0x66},{0x7d,0xce,0x5c,0x21,0xa6,0x68}, + {0x73,0xc7,0x63,0x10,0x85,0x42},{0x71,0xc4,0x6a,0x1b,0x88,0x4c}, + {0x77,0xc1,0x71,0x06,0x9f,0x5e},{0x75,0xc2,0x78,0x0d,0x92,0x50}, + {0x6b,0xd3,0x0f,0x64,0xd9,0x0a},{0x69,0xd0,0x06,0x6f,0xd4,0x04}, + {0x6f,0xd5,0x1d,0x72,0xc3,0x16},{0x6d,0xd6,0x14,0x79,0xce,0x18}, + {0x63,0xdf,0x2b,0x48,0xed,0x32},{0x61,0xdc,0x22,0x43,0xe0,0x3c}, + {0x67,0xd9,0x39,0x5e,0xf7,0x2e},{0x65,0xda,0x30,0x55,0xfa,0x20}, + {0x9b,0x5b,0x9a,0x01,0xb7,0xec},{0x99,0x58,0x93,0x0a,0xba,0xe2}, + {0x9f,0x5d,0x88,0x17,0xad,0xf0},{0x9d,0x5e,0x81,0x1c,0xa0,0xfe}, + {0x93,0x57,0xbe,0x2d,0x83,0xd4},{0x91,0x54,0xb7,0x26,0x8e,0xda}, + {0x97,0x51,0xac,0x3b,0x99,0xc8},{0x95,0x52,0xa5,0x30,0x94,0xc6}, + {0x8b,0x43,0xd2,0x59,0xdf,0x9c},{0x89,0x40,0xdb,0x52,0xd2,0x92}, + {0x8f,0x45,0xc0,0x4f,0xc5,0x80},{0x8d,0x46,0xc9,0x44,0xc8,0x8e}, + {0x83,0x4f,0xf6,0x75,0xeb,0xa4},{0x81,0x4c,0xff,0x7e,0xe6,0xaa}, + {0x87,0x49,0xe4,0x63,0xf1,0xb8},{0x85,0x4a,0xed,0x68,0xfc,0xb6}, + {0xbb,0x6b,0x0a,0xb1,0x67,0x0c},{0xb9,0x68,0x03,0xba,0x6a,0x02}, + {0xbf,0x6d,0x18,0xa7,0x7d,0x10},{0xbd,0x6e,0x11,0xac,0x70,0x1e}, + {0xb3,0x67,0x2e,0x9d,0x53,0x34},{0xb1,0x64,0x27,0x96,0x5e,0x3a}, + {0xb7,0x61,0x3c,0x8b,0x49,0x28},{0xb5,0x62,0x35,0x80,0x44,0x26}, + {0xab,0x73,0x42,0xe9,0x0f,0x7c},{0xa9,0x70,0x4b,0xe2,0x02,0x72}, + {0xaf,0x75,0x50,0xff,0x15,0x60},{0xad,0x76,0x59,0xf4,0x18,0x6e}, + {0xa3,0x7f,0x66,0xc5,0x3b,0x44},{0xa1,0x7c,0x6f,0xce,0x36,0x4a}, + {0xa7,0x79,0x74,0xd3,0x21,0x58},{0xa5,0x7a,0x7d,0xd8,0x2c,0x56}, + {0xdb,0x3b,0xa1,0x7a,0x0c,0x37},{0xd9,0x38,0xa8,0x71,0x01,0x39}, + {0xdf,0x3d,0xb3,0x6c,0x16,0x2b},{0xdd,0x3e,0xba,0x67,0x1b,0x25}, + {0xd3,0x37,0x85,0x56,0x38,0x0f},{0xd1,0x34,0x8c,0x5d,0x35,0x01}, + {0xd7,0x31,0x97,0x40,0x22,0x13},{0xd5,0x32,0x9e,0x4b,0x2f,0x1d}, + {0xcb,0x23,0xe9,0x22,0x64,0x47},{0xc9,0x20,0xe0,0x29,0x69,0x49}, + {0xcf,0x25,0xfb,0x34,0x7e,0x5b},{0xcd,0x26,0xf2,0x3f,0x73,0x55}, + {0xc3,0x2f,0xcd,0x0e,0x50,0x7f},{0xc1,0x2c,0xc4,0x05,0x5d,0x71}, + {0xc7,0x29,0xdf,0x18,0x4a,0x63},{0xc5,0x2a,0xd6,0x13,0x47,0x6d}, + {0xfb,0x0b,0x31,0xca,0xdc,0xd7},{0xf9,0x08,0x38,0xc1,0xd1,0xd9}, + {0xff,0x0d,0x23,0xdc,0xc6,0xcb},{0xfd,0x0e,0x2a,0xd7,0xcb,0xc5}, + {0xf3,0x07,0x15,0xe6,0xe8,0xef},{0xf1,0x04,0x1c,0xed,0xe5,0xe1}, + {0xf7,0x01,0x07,0xf0,0xf2,0xf3},{0xf5,0x02,0x0e,0xfb,0xff,0xfd}, + {0xeb,0x13,0x79,0x92,0xb4,0xa7},{0xe9,0x10,0x70,0x99,0xb9,0xa9}, + {0xef,0x15,0x6b,0x84,0xae,0xbb},{0xed,0x16,0x62,0x8f,0xa3,0xb5}, + {0xe3,0x1f,0x5d,0xbe,0x80,0x9f},{0xe1,0x1c,0x54,0xb5,0x8d,0x91}, + {0xe7,0x19,0x4f,0xa8,0x9a,0x83},{0xe5,0x1a,0x46,0xa3,0x97,0x8d} +}; + +/*********************** FUNCTION DEFINITIONS ***********************/ +// XORs the in and out buffers, storing the result in out. Length is in bytes. +void xor_buf(const BYTE in[], BYTE out[], size_t len) +{ + size_t idx; + + for (idx = 0; idx < len; idx++) + out[idx] ^= in[idx]; +} + +/******************* +* AES - CBC +*******************/ +int aes_encrypt_cbc(const BYTE in[], size_t in_len, BYTE out[], const UINT key[], int keysize, const BYTE iv[]) +{ + BYTE buf_in[AES_BLOCK_SIZE], buf_out[AES_BLOCK_SIZE], iv_buf[AES_BLOCK_SIZE]; + int blocks, idx; + + if (in_len % AES_BLOCK_SIZE != 0) + return(FALSE); + + blocks = (int)(in_len / AES_BLOCK_SIZE); + + memcpy(iv_buf, iv, AES_BLOCK_SIZE); + + for (idx = 0; idx < blocks; idx++) { + memcpy(buf_in, &in[idx * AES_BLOCK_SIZE], AES_BLOCK_SIZE); + xor_buf(iv_buf, buf_in, AES_BLOCK_SIZE); + aes_encrypt(buf_in, buf_out, key, keysize); + memcpy(&out[idx * AES_BLOCK_SIZE], buf_out, AES_BLOCK_SIZE); + memcpy(iv_buf, buf_out, AES_BLOCK_SIZE); + } + + return(TRUE); +} + +int aes_encrypt_cbc_mac(const BYTE in[], size_t in_len, BYTE out[], const UINT key[], int keysize, const BYTE iv[]) +{ + BYTE buf_in[AES_BLOCK_SIZE], buf_out[AES_BLOCK_SIZE], iv_buf[AES_BLOCK_SIZE]; + int blocks, idx; + + if (in_len % AES_BLOCK_SIZE != 0) + return(FALSE); + + blocks = (int)(in_len / AES_BLOCK_SIZE); + + memcpy(iv_buf, iv, AES_BLOCK_SIZE); + + for (idx = 0; idx < blocks; idx++) { + memcpy(buf_in, &in[idx * AES_BLOCK_SIZE], AES_BLOCK_SIZE); + xor_buf(iv_buf, buf_in, AES_BLOCK_SIZE); + aes_encrypt(buf_in, buf_out, key, keysize); + memcpy(iv_buf, buf_out, AES_BLOCK_SIZE); + // Do not output all encrypted blocks. + } + + memcpy(out, buf_out, AES_BLOCK_SIZE); // Only output the last block. + + return(TRUE); +} + +int aes_decrypt_cbc(const BYTE in[], size_t in_len, BYTE out[], const UINT key[], int keysize, const BYTE iv[]) +{ + BYTE buf_in[AES_BLOCK_SIZE], buf_out[AES_BLOCK_SIZE], iv_buf[AES_BLOCK_SIZE]; + int blocks, idx; + + if (in_len % AES_BLOCK_SIZE != 0) + return(FALSE); + + blocks = (int)(in_len / AES_BLOCK_SIZE); + + memcpy(iv_buf, iv, AES_BLOCK_SIZE); + + for (idx = 0; idx < blocks; idx++) { + memcpy(buf_in, &in[idx * AES_BLOCK_SIZE], AES_BLOCK_SIZE); + aes_decrypt(buf_in, buf_out, key, keysize); + xor_buf(iv_buf, buf_out, AES_BLOCK_SIZE); + memcpy(&out[idx * AES_BLOCK_SIZE], buf_out, AES_BLOCK_SIZE); + memcpy(iv_buf, buf_in, AES_BLOCK_SIZE); + } + + return(TRUE); +} + +/******************* +* AES - CTR +*******************/ +void increment_iv(BYTE iv[], int counter_size) +{ + int idx; + + // Use counter_size bytes at the end of the IV as the big-endian integer to increment. + for (idx = AES_BLOCK_SIZE - 1; idx >= AES_BLOCK_SIZE - counter_size; idx--) { + iv[idx]++; + if (iv[idx] != 0 || idx == AES_BLOCK_SIZE - counter_size) + break; + } +} + +// Performs the encryption in-place, the input and output buffers may be the same. +// Input may be an arbitrary length (in bytes). +void aes_encrypt_ctr(const BYTE in[], size_t in_len, BYTE out[], const UINT key[], int keysize, const BYTE iv[]) +{ + size_t idx = 0, last_block_length; + BYTE iv_buf[AES_BLOCK_SIZE], out_buf[AES_BLOCK_SIZE]; + + if (in != out) + memcpy(out, in, in_len); + + memcpy(iv_buf, iv, AES_BLOCK_SIZE); + last_block_length = in_len - AES_BLOCK_SIZE; + + if (in_len > AES_BLOCK_SIZE) { + for (idx = 0; idx < last_block_length; idx += AES_BLOCK_SIZE) { + aes_encrypt(iv_buf, out_buf, key, keysize); + xor_buf(out_buf, &out[idx], AES_BLOCK_SIZE); + increment_iv(iv_buf, AES_BLOCK_SIZE); + } + } + + aes_encrypt(iv_buf, out_buf, key, keysize); + xor_buf(out_buf, &out[idx], in_len - idx); // Use the Most Significant bytes. +} + +void aes_decrypt_ctr(const BYTE in[], size_t in_len, BYTE out[], const UINT key[], int keysize, const BYTE iv[]) +{ + // CTR encryption is its own inverse function. + aes_encrypt_ctr(in, in_len, out, key, keysize, iv); +} + +/******************* +* AES - CCM +*******************/ +// out_len = payload_len + assoc_len +int aes_encrypt_ccm(const BYTE payload[], UINT payload_len, const BYTE assoc[], unsigned short assoc_len, + const BYTE nonce[], unsigned short nonce_len, BYTE out[], UINT *out_len, + UINT mac_len, const BYTE key_str[], int keysize) +{ + BYTE temp_iv[AES_BLOCK_SIZE], counter[AES_BLOCK_SIZE], mac[16], *buf; + int end_of_buf, payload_len_store_size; + UINT key[60]; + + if (mac_len != 4 && mac_len != 6 && mac_len != 8 && mac_len != 10 && + mac_len != 12 && mac_len != 14 && mac_len != 16) + return(FALSE); + + if (nonce_len < 7 || nonce_len > 13) + return(FALSE); + + if (assoc_len > 32768 /* = 2^15 */) + return(FALSE); + + buf = (BYTE*)malloc(payload_len + assoc_len + 48 /*Round both payload and associated data up a block size and add an extra block.*/); + if (! buf) + return(FALSE); + + // Prepare the key for usage. + aes_key_setup(key_str, key, keysize); + + // Format the first block of the formatted data. + payload_len_store_size = AES_BLOCK_SIZE - 1 - nonce_len; + ccm_prepare_first_format_blk(buf, assoc_len, payload_len, payload_len_store_size, mac_len, nonce, nonce_len); + end_of_buf = AES_BLOCK_SIZE; + + // Format the Associated Data, aka, assoc[]. + ccm_format_assoc_data(buf, &end_of_buf, assoc, assoc_len); + + // Format the Payload, aka payload[]. + ccm_format_payload_data(buf, &end_of_buf, payload, payload_len); + + // Create the first counter block. + ccm_prepare_first_ctr_blk(counter, nonce, nonce_len, payload_len_store_size); + + // Perform the CBC operation with an IV of zeros on the formatted buffer to calculate the MAC. + memset(temp_iv, 0, AES_BLOCK_SIZE); + aes_encrypt_cbc_mac(buf, end_of_buf, mac, key, keysize, temp_iv); + + // Copy the Payload and MAC to the output buffer. + memcpy(out, payload, payload_len); + memcpy(&out[payload_len], mac, mac_len); + + // Encrypt the Payload with CTR mode with a counter starting at 1. + memcpy(temp_iv, counter, AES_BLOCK_SIZE); + increment_iv(temp_iv, AES_BLOCK_SIZE - 1 - mac_len); // Last argument is the byte size of the counting portion of the counter block. /*BUG?*/ + aes_encrypt_ctr(out, payload_len, out, key, keysize, temp_iv); + + // Encrypt the MAC with CTR mode with a counter starting at 0. + aes_encrypt_ctr(&out[payload_len], mac_len, &out[payload_len], key, keysize, counter); + + free(buf); + *out_len = payload_len + mac_len; + + return(TRUE); +} + +// plaintext_len = ciphertext_len - mac_len +// Needs a flag for whether the MAC matches. +int aes_decrypt_ccm(const BYTE ciphertext[], UINT ciphertext_len, const BYTE assoc[], unsigned short assoc_len, + const BYTE nonce[], unsigned short nonce_len, BYTE plaintext[], UINT *plaintext_len, + UINT mac_len, int *mac_auth, const BYTE key_str[], int keysize) +{ + BYTE temp_iv[AES_BLOCK_SIZE], counter[AES_BLOCK_SIZE], mac[16], mac_buf[16], *buf; + int end_of_buf, plaintext_len_store_size; + UINT key[60]; + + if (ciphertext_len <= mac_len) + return(FALSE); + + buf = (BYTE*)malloc(assoc_len + ciphertext_len /*ciphertext_len = plaintext_len + mac_len*/ + 48); + if (! buf) + return(FALSE); + + // Prepare the key for usage. + aes_key_setup(key_str, key, keysize); + + // Copy the plaintext and MAC to the output buffers. + *plaintext_len = ciphertext_len - mac_len; + plaintext_len_store_size = AES_BLOCK_SIZE - 1 - nonce_len; + memcpy(plaintext, ciphertext, *plaintext_len); + memcpy(mac, &ciphertext[*plaintext_len], mac_len); + + // Prepare the first counter block for use in decryption. + ccm_prepare_first_ctr_blk(counter, nonce, nonce_len, plaintext_len_store_size); + + // Decrypt the Payload with CTR mode with a counter starting at 1. + memcpy(temp_iv, counter, AES_BLOCK_SIZE); + increment_iv(temp_iv, AES_BLOCK_SIZE - 1 - mac_len); // (AES_BLOCK_SIZE - 1 - mac_len) is the byte size of the counting portion of the counter block. + aes_decrypt_ctr(plaintext, *plaintext_len, plaintext, key, keysize, temp_iv); + + // Setting mac_auth to nullptr disables the authentication check. + if (mac_auth != nullptr) { + // Decrypt the MAC with CTR mode with a counter starting at 0. + aes_decrypt_ctr(mac, mac_len, mac, key, keysize, counter); + + // Format the first block of the formatted data. + plaintext_len_store_size = AES_BLOCK_SIZE - 1 - nonce_len; + ccm_prepare_first_format_blk(buf, assoc_len, *plaintext_len, plaintext_len_store_size, mac_len, nonce, nonce_len); + end_of_buf = AES_BLOCK_SIZE; + + // Format the Associated Data into the authentication buffer. + ccm_format_assoc_data(buf, &end_of_buf, assoc, assoc_len); + + // Format the Payload into the authentication buffer. + ccm_format_payload_data(buf, &end_of_buf, plaintext, *plaintext_len); + + // Perform the CBC operation with an IV of zeros on the formatted buffer to calculate the MAC. + memset(temp_iv, 0, AES_BLOCK_SIZE); + aes_encrypt_cbc_mac(buf, end_of_buf, mac_buf, key, keysize, temp_iv); + + // Compare the calculated MAC against the MAC embedded in the ciphertext to see if they are the same. + if (! memcmp(mac, mac_buf, mac_len)) { + *mac_auth = TRUE; + } + else { + *mac_auth = FALSE; + memset(plaintext, 0, *plaintext_len); + } + } + + free(buf); + + return(TRUE); +} + +// Creates the first counter block. First byte is flags, then the nonce, then the incremented part. +void ccm_prepare_first_ctr_blk(BYTE counter[], const BYTE nonce[], int nonce_len, int payload_len_store_size) +{ + memset(counter, 0, AES_BLOCK_SIZE); + counter[0] = (payload_len_store_size - 1) & 0x07; + memcpy(&counter[1], nonce, nonce_len); +} + +void ccm_prepare_first_format_blk(BYTE buf[], int assoc_len, int payload_len, int payload_len_store_size, int mac_len, const BYTE nonce[], int nonce_len) +{ + // Set the flags for the first byte of the first block. + buf[0] = ((((mac_len - 2) / 2) & 0x07) << 3) | ((payload_len_store_size - 1) & 0x07); + if (assoc_len > 0) + buf[0] += 0x40; + // Format the rest of the first block, storing the nonce and the size of the payload. + memcpy(&buf[1], nonce, nonce_len); + memset(&buf[1 + nonce_len], 0, AES_BLOCK_SIZE - 1 - nonce_len); + buf[15] = payload_len & 0x000000FF; + buf[14] = (payload_len >> 8) & 0x000000FF; +} + +void ccm_format_assoc_data(BYTE buf[], int *end_of_buf, const BYTE assoc[], int assoc_len) +{ + int pad; + + buf[*end_of_buf + 1] = assoc_len & 0x00FF; + buf[*end_of_buf] = (assoc_len >> 8) & 0x00FF; + *end_of_buf += 2; + memcpy(&buf[*end_of_buf], assoc, assoc_len); + *end_of_buf += assoc_len; + pad = AES_BLOCK_SIZE - (*end_of_buf % AES_BLOCK_SIZE); /*BUG?*/ + memset(&buf[*end_of_buf], 0, pad); + *end_of_buf += pad; +} + +void ccm_format_payload_data(BYTE buf[], int *end_of_buf, const BYTE payload[], int payload_len) +{ + int pad; + + memcpy(&buf[*end_of_buf], payload, payload_len); + *end_of_buf += payload_len; + pad = *end_of_buf % AES_BLOCK_SIZE; + if (pad != 0) + pad = AES_BLOCK_SIZE - pad; + memset(&buf[*end_of_buf], 0, pad); + *end_of_buf += pad; +} + +/******************* +* AES +*******************/ +///////////////// +// KEY EXPANSION +///////////////// + +// Substitutes a word using the AES S-Box. +UINT SubWord(UINT word) +{ + unsigned int result; + + result = (int)aes_sbox[(word >> 4) & 0x0000000F][word & 0x0000000F]; + result += (int)aes_sbox[(word >> 12) & 0x0000000F][(word >> 8) & 0x0000000F] << 8; + result += (int)aes_sbox[(word >> 20) & 0x0000000F][(word >> 16) & 0x0000000F] << 16; + result += (int)aes_sbox[(word >> 28) & 0x0000000F][(word >> 24) & 0x0000000F] << 24; + return(result); +} + +// Performs the action of generating the keys that will be used in every round of +// encryption. "key" is the user-supplied input key, "w" is the output key schedule, +// "keysize" is the length in bits of "key", must be 128, 192, or 256. +void aes_key_setup(const BYTE key[], UINT w[], int keysize) +{ + int Nb=4,Nr,Nk,idx; + UINT temp,Rcon[]={0x01000000,0x02000000,0x04000000,0x08000000,0x10000000,0x20000000, + 0x40000000,0x80000000,0x1b000000,0x36000000,0x6c000000,0xd8000000, + 0xab000000,0x4d000000,0x9a000000}; + + switch (keysize) { + case 128: Nr = 10; Nk = 4; break; + case 192: Nr = 12; Nk = 6; break; + case 256: Nr = 14; Nk = 8; break; + default: return; + } + + for (idx=0; idx < Nk; ++idx) { + w[idx] = ((key[4 * idx]) << 24) | ((key[4 * idx + 1]) << 16) | + ((key[4 * idx + 2]) << 8) | ((key[4 * idx + 3])); + } + + for (idx = Nk; idx < Nb * (Nr+1); ++idx) { + temp = w[idx - 1]; + if ((idx % Nk) == 0) + temp = SubWord(KE_ROTWORD(temp)) ^ Rcon[(idx-1)/Nk]; + else if (Nk > 6 && (idx % Nk) == 4) + temp = SubWord(temp); + w[idx] = w[idx-Nk] ^ temp; + } +} + +///////////////// +// ADD ROUND KEY +///////////////// + +// Performs the AddRoundKey step. Each round has its own pre-generated 16-byte key in the +// form of 4 integers (the "w" array). Each integer is XOR'd by one column of the state. +// Also performs the job of InvAddRoundKey(); since the function is a simple XOR process, +// it is its own inverse. +void AddRoundKey(BYTE state[][4], const UINT w[]) +{ + BYTE subkey[4]; + + // memcpy(subkey,&w[idx],4); // Not accurate for big endian machines + // Subkey 1 + subkey[0] = w[0] >> 24; + subkey[1] = w[0] >> 16; + subkey[2] = w[0] >> 8; + subkey[3] = w[0]; + state[0][0] ^= subkey[0]; + state[1][0] ^= subkey[1]; + state[2][0] ^= subkey[2]; + state[3][0] ^= subkey[3]; + // Subkey 2 + subkey[0] = w[1] >> 24; + subkey[1] = w[1] >> 16; + subkey[2] = w[1] >> 8; + subkey[3] = w[1]; + state[0][1] ^= subkey[0]; + state[1][1] ^= subkey[1]; + state[2][1] ^= subkey[2]; + state[3][1] ^= subkey[3]; + // Subkey 3 + subkey[0] = w[2] >> 24; + subkey[1] = w[2] >> 16; + subkey[2] = w[2] >> 8; + subkey[3] = w[2]; + state[0][2] ^= subkey[0]; + state[1][2] ^= subkey[1]; + state[2][2] ^= subkey[2]; + state[3][2] ^= subkey[3]; + // Subkey 4 + subkey[0] = w[3] >> 24; + subkey[1] = w[3] >> 16; + subkey[2] = w[3] >> 8; + subkey[3] = w[3]; + state[0][3] ^= subkey[0]; + state[1][3] ^= subkey[1]; + state[2][3] ^= subkey[2]; + state[3][3] ^= subkey[3]; +} + +///////////////// +// (Inv)SubBytes +///////////////// + +// Performs the SubBytes step. All bytes in the state are substituted with a +// pre-calculated value from a lookup table. +void SubBytes(BYTE state[][4]) +{ + state[0][0] = aes_sbox[state[0][0] >> 4][state[0][0] & 0x0F]; + state[0][1] = aes_sbox[state[0][1] >> 4][state[0][1] & 0x0F]; + state[0][2] = aes_sbox[state[0][2] >> 4][state[0][2] & 0x0F]; + state[0][3] = aes_sbox[state[0][3] >> 4][state[0][3] & 0x0F]; + state[1][0] = aes_sbox[state[1][0] >> 4][state[1][0] & 0x0F]; + state[1][1] = aes_sbox[state[1][1] >> 4][state[1][1] & 0x0F]; + state[1][2] = aes_sbox[state[1][2] >> 4][state[1][2] & 0x0F]; + state[1][3] = aes_sbox[state[1][3] >> 4][state[1][3] & 0x0F]; + state[2][0] = aes_sbox[state[2][0] >> 4][state[2][0] & 0x0F]; + state[2][1] = aes_sbox[state[2][1] >> 4][state[2][1] & 0x0F]; + state[2][2] = aes_sbox[state[2][2] >> 4][state[2][2] & 0x0F]; + state[2][3] = aes_sbox[state[2][3] >> 4][state[2][3] & 0x0F]; + state[3][0] = aes_sbox[state[3][0] >> 4][state[3][0] & 0x0F]; + state[3][1] = aes_sbox[state[3][1] >> 4][state[3][1] & 0x0F]; + state[3][2] = aes_sbox[state[3][2] >> 4][state[3][2] & 0x0F]; + state[3][3] = aes_sbox[state[3][3] >> 4][state[3][3] & 0x0F]; +} + +void InvSubBytes(BYTE state[][4]) +{ + state[0][0] = aes_invsbox[state[0][0] >> 4][state[0][0] & 0x0F]; + state[0][1] = aes_invsbox[state[0][1] >> 4][state[0][1] & 0x0F]; + state[0][2] = aes_invsbox[state[0][2] >> 4][state[0][2] & 0x0F]; + state[0][3] = aes_invsbox[state[0][3] >> 4][state[0][3] & 0x0F]; + state[1][0] = aes_invsbox[state[1][0] >> 4][state[1][0] & 0x0F]; + state[1][1] = aes_invsbox[state[1][1] >> 4][state[1][1] & 0x0F]; + state[1][2] = aes_invsbox[state[1][2] >> 4][state[1][2] & 0x0F]; + state[1][3] = aes_invsbox[state[1][3] >> 4][state[1][3] & 0x0F]; + state[2][0] = aes_invsbox[state[2][0] >> 4][state[2][0] & 0x0F]; + state[2][1] = aes_invsbox[state[2][1] >> 4][state[2][1] & 0x0F]; + state[2][2] = aes_invsbox[state[2][2] >> 4][state[2][2] & 0x0F]; + state[2][3] = aes_invsbox[state[2][3] >> 4][state[2][3] & 0x0F]; + state[3][0] = aes_invsbox[state[3][0] >> 4][state[3][0] & 0x0F]; + state[3][1] = aes_invsbox[state[3][1] >> 4][state[3][1] & 0x0F]; + state[3][2] = aes_invsbox[state[3][2] >> 4][state[3][2] & 0x0F]; + state[3][3] = aes_invsbox[state[3][3] >> 4][state[3][3] & 0x0F]; +} + +///////////////// +// (Inv)ShiftRows +///////////////// + +// Performs the ShiftRows step. All rows are shifted cylindrically to the left. +void ShiftRows(BYTE state[][4]) +{ + int t; + + // Shift left by 1 + t = state[1][0]; + state[1][0] = state[1][1]; + state[1][1] = state[1][2]; + state[1][2] = state[1][3]; + state[1][3] = t; + // Shift left by 2 + t = state[2][0]; + state[2][0] = state[2][2]; + state[2][2] = t; + t = state[2][1]; + state[2][1] = state[2][3]; + state[2][3] = t; + // Shift left by 3 + t = state[3][0]; + state[3][0] = state[3][3]; + state[3][3] = state[3][2]; + state[3][2] = state[3][1]; + state[3][1] = t; +} + +// All rows are shifted cylindrically to the right. +void InvShiftRows(BYTE state[][4]) +{ + int t; + + // Shift right by 1 + t = state[1][3]; + state[1][3] = state[1][2]; + state[1][2] = state[1][1]; + state[1][1] = state[1][0]; + state[1][0] = t; + // Shift right by 2 + t = state[2][3]; + state[2][3] = state[2][1]; + state[2][1] = t; + t = state[2][2]; + state[2][2] = state[2][0]; + state[2][0] = t; + // Shift right by 3 + t = state[3][3]; + state[3][3] = state[3][0]; + state[3][0] = state[3][1]; + state[3][1] = state[3][2]; + state[3][2] = t; +} + +///////////////// +// (Inv)MixColumns +///////////////// + +// Performs the MixColums step. The state is multiplied by itself using matrix +// multiplication in a Galios Field 2^8. All multiplication is pre-computed in a table. +// Addition is equivilent to XOR. (Must always make a copy of the column as the original +// values will be destoyed.) +void MixColumns(BYTE state[][4]) +{ + BYTE col[4]; + + // Column 1 + col[0] = state[0][0]; + col[1] = state[1][0]; + col[2] = state[2][0]; + col[3] = state[3][0]; + state[0][0] = gf_mul[col[0]][0]; + state[0][0] ^= gf_mul[col[1]][1]; + state[0][0] ^= col[2]; + state[0][0] ^= col[3]; + state[1][0] = col[0]; + state[1][0] ^= gf_mul[col[1]][0]; + state[1][0] ^= gf_mul[col[2]][1]; + state[1][0] ^= col[3]; + state[2][0] = col[0]; + state[2][0] ^= col[1]; + state[2][0] ^= gf_mul[col[2]][0]; + state[2][0] ^= gf_mul[col[3]][1]; + state[3][0] = gf_mul[col[0]][1]; + state[3][0] ^= col[1]; + state[3][0] ^= col[2]; + state[3][0] ^= gf_mul[col[3]][0]; + // Column 2 + col[0] = state[0][1]; + col[1] = state[1][1]; + col[2] = state[2][1]; + col[3] = state[3][1]; + state[0][1] = gf_mul[col[0]][0]; + state[0][1] ^= gf_mul[col[1]][1]; + state[0][1] ^= col[2]; + state[0][1] ^= col[3]; + state[1][1] = col[0]; + state[1][1] ^= gf_mul[col[1]][0]; + state[1][1] ^= gf_mul[col[2]][1]; + state[1][1] ^= col[3]; + state[2][1] = col[0]; + state[2][1] ^= col[1]; + state[2][1] ^= gf_mul[col[2]][0]; + state[2][1] ^= gf_mul[col[3]][1]; + state[3][1] = gf_mul[col[0]][1]; + state[3][1] ^= col[1]; + state[3][1] ^= col[2]; + state[3][1] ^= gf_mul[col[3]][0]; + // Column 3 + col[0] = state[0][2]; + col[1] = state[1][2]; + col[2] = state[2][2]; + col[3] = state[3][2]; + state[0][2] = gf_mul[col[0]][0]; + state[0][2] ^= gf_mul[col[1]][1]; + state[0][2] ^= col[2]; + state[0][2] ^= col[3]; + state[1][2] = col[0]; + state[1][2] ^= gf_mul[col[1]][0]; + state[1][2] ^= gf_mul[col[2]][1]; + state[1][2] ^= col[3]; + state[2][2] = col[0]; + state[2][2] ^= col[1]; + state[2][2] ^= gf_mul[col[2]][0]; + state[2][2] ^= gf_mul[col[3]][1]; + state[3][2] = gf_mul[col[0]][1]; + state[3][2] ^= col[1]; + state[3][2] ^= col[2]; + state[3][2] ^= gf_mul[col[3]][0]; + // Column 4 + col[0] = state[0][3]; + col[1] = state[1][3]; + col[2] = state[2][3]; + col[3] = state[3][3]; + state[0][3] = gf_mul[col[0]][0]; + state[0][3] ^= gf_mul[col[1]][1]; + state[0][3] ^= col[2]; + state[0][3] ^= col[3]; + state[1][3] = col[0]; + state[1][3] ^= gf_mul[col[1]][0]; + state[1][3] ^= gf_mul[col[2]][1]; + state[1][3] ^= col[3]; + state[2][3] = col[0]; + state[2][3] ^= col[1]; + state[2][3] ^= gf_mul[col[2]][0]; + state[2][3] ^= gf_mul[col[3]][1]; + state[3][3] = gf_mul[col[0]][1]; + state[3][3] ^= col[1]; + state[3][3] ^= col[2]; + state[3][3] ^= gf_mul[col[3]][0]; +} + +void InvMixColumns(BYTE state[][4]) +{ + BYTE col[4]; + + // Column 1 + col[0] = state[0][0]; + col[1] = state[1][0]; + col[2] = state[2][0]; + col[3] = state[3][0]; + state[0][0] = gf_mul[col[0]][5]; + state[0][0] ^= gf_mul[col[1]][3]; + state[0][0] ^= gf_mul[col[2]][4]; + state[0][0] ^= gf_mul[col[3]][2]; + state[1][0] = gf_mul[col[0]][2]; + state[1][0] ^= gf_mul[col[1]][5]; + state[1][0] ^= gf_mul[col[2]][3]; + state[1][0] ^= gf_mul[col[3]][4]; + state[2][0] = gf_mul[col[0]][4]; + state[2][0] ^= gf_mul[col[1]][2]; + state[2][0] ^= gf_mul[col[2]][5]; + state[2][0] ^= gf_mul[col[3]][3]; + state[3][0] = gf_mul[col[0]][3]; + state[3][0] ^= gf_mul[col[1]][4]; + state[3][0] ^= gf_mul[col[2]][2]; + state[3][0] ^= gf_mul[col[3]][5]; + // Column 2 + col[0] = state[0][1]; + col[1] = state[1][1]; + col[2] = state[2][1]; + col[3] = state[3][1]; + state[0][1] = gf_mul[col[0]][5]; + state[0][1] ^= gf_mul[col[1]][3]; + state[0][1] ^= gf_mul[col[2]][4]; + state[0][1] ^= gf_mul[col[3]][2]; + state[1][1] = gf_mul[col[0]][2]; + state[1][1] ^= gf_mul[col[1]][5]; + state[1][1] ^= gf_mul[col[2]][3]; + state[1][1] ^= gf_mul[col[3]][4]; + state[2][1] = gf_mul[col[0]][4]; + state[2][1] ^= gf_mul[col[1]][2]; + state[2][1] ^= gf_mul[col[2]][5]; + state[2][1] ^= gf_mul[col[3]][3]; + state[3][1] = gf_mul[col[0]][3]; + state[3][1] ^= gf_mul[col[1]][4]; + state[3][1] ^= gf_mul[col[2]][2]; + state[3][1] ^= gf_mul[col[3]][5]; + // Column 3 + col[0] = state[0][2]; + col[1] = state[1][2]; + col[2] = state[2][2]; + col[3] = state[3][2]; + state[0][2] = gf_mul[col[0]][5]; + state[0][2] ^= gf_mul[col[1]][3]; + state[0][2] ^= gf_mul[col[2]][4]; + state[0][2] ^= gf_mul[col[3]][2]; + state[1][2] = gf_mul[col[0]][2]; + state[1][2] ^= gf_mul[col[1]][5]; + state[1][2] ^= gf_mul[col[2]][3]; + state[1][2] ^= gf_mul[col[3]][4]; + state[2][2] = gf_mul[col[0]][4]; + state[2][2] ^= gf_mul[col[1]][2]; + state[2][2] ^= gf_mul[col[2]][5]; + state[2][2] ^= gf_mul[col[3]][3]; + state[3][2] = gf_mul[col[0]][3]; + state[3][2] ^= gf_mul[col[1]][4]; + state[3][2] ^= gf_mul[col[2]][2]; + state[3][2] ^= gf_mul[col[3]][5]; + // Column 4 + col[0] = state[0][3]; + col[1] = state[1][3]; + col[2] = state[2][3]; + col[3] = state[3][3]; + state[0][3] = gf_mul[col[0]][5]; + state[0][3] ^= gf_mul[col[1]][3]; + state[0][3] ^= gf_mul[col[2]][4]; + state[0][3] ^= gf_mul[col[3]][2]; + state[1][3] = gf_mul[col[0]][2]; + state[1][3] ^= gf_mul[col[1]][5]; + state[1][3] ^= gf_mul[col[2]][3]; + state[1][3] ^= gf_mul[col[3]][4]; + state[2][3] = gf_mul[col[0]][4]; + state[2][3] ^= gf_mul[col[1]][2]; + state[2][3] ^= gf_mul[col[2]][5]; + state[2][3] ^= gf_mul[col[3]][3]; + state[3][3] = gf_mul[col[0]][3]; + state[3][3] ^= gf_mul[col[1]][4]; + state[3][3] ^= gf_mul[col[2]][2]; + state[3][3] ^= gf_mul[col[3]][5]; +} + +///////////////// +// (En/De)Crypt +///////////////// + +void aes_encrypt(const BYTE in[], BYTE out[], const UINT key[], int keysize) +{ + BYTE state[4][4]; + + // Copy input array (should be 16 bytes long) to a matrix (sequential bytes are ordered + // by row, not col) called "state" for processing. + // *** Implementation note: The official AES documentation references the state by + // column, then row. Accessing an element in C requires row then column. Thus, all state + // references in AES must have the column and row indexes reversed for C implementation. + state[0][0] = in[0]; + state[1][0] = in[1]; + state[2][0] = in[2]; + state[3][0] = in[3]; + state[0][1] = in[4]; + state[1][1] = in[5]; + state[2][1] = in[6]; + state[3][1] = in[7]; + state[0][2] = in[8]; + state[1][2] = in[9]; + state[2][2] = in[10]; + state[3][2] = in[11]; + state[0][3] = in[12]; + state[1][3] = in[13]; + state[2][3] = in[14]; + state[3][3] = in[15]; + + // Perform the necessary number of rounds. The round key is added first. + // The last round does not perform the MixColumns step. + AddRoundKey(state,&key[0]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[4]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[8]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[12]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[16]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[20]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[24]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[28]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[32]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[36]); + if (keysize != 128) { + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[40]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[44]); + if (keysize != 192) { + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[48]); + SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[52]); + SubBytes(state); ShiftRows(state); AddRoundKey(state,&key[56]); + } + else { + SubBytes(state); ShiftRows(state); AddRoundKey(state,&key[48]); + } + } + else { + SubBytes(state); ShiftRows(state); AddRoundKey(state,&key[40]); + } + + // Copy the state to the output array. + out[0] = state[0][0]; + out[1] = state[1][0]; + out[2] = state[2][0]; + out[3] = state[3][0]; + out[4] = state[0][1]; + out[5] = state[1][1]; + out[6] = state[2][1]; + out[7] = state[3][1]; + out[8] = state[0][2]; + out[9] = state[1][2]; + out[10] = state[2][2]; + out[11] = state[3][2]; + out[12] = state[0][3]; + out[13] = state[1][3]; + out[14] = state[2][3]; + out[15] = state[3][3]; +} + +void aes_decrypt(const BYTE in[], BYTE out[], const UINT key[], int keysize) +{ + BYTE state[4][4]; + + // Copy the input to the state. + state[0][0] = in[0]; + state[1][0] = in[1]; + state[2][0] = in[2]; + state[3][0] = in[3]; + state[0][1] = in[4]; + state[1][1] = in[5]; + state[2][1] = in[6]; + state[3][1] = in[7]; + state[0][2] = in[8]; + state[1][2] = in[9]; + state[2][2] = in[10]; + state[3][2] = in[11]; + state[0][3] = in[12]; + state[1][3] = in[13]; + state[2][3] = in[14]; + state[3][3] = in[15]; + + // Perform the necessary number of rounds. The round key is added first. + // The last round does not perform the MixColumns step. + if (keysize > 128) { + if (keysize > 192) { + AddRoundKey(state,&key[56]); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[52]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[48]);InvMixColumns(state); + } + else { + AddRoundKey(state,&key[48]); + } + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[44]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[40]);InvMixColumns(state); + } + else { + AddRoundKey(state,&key[40]); + } + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[36]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[32]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[28]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[24]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[20]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[16]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[12]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[8]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[4]);InvMixColumns(state); + InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[0]); + + // Copy the state to the output array. + out[0] = state[0][0]; + out[1] = state[1][0]; + out[2] = state[2][0]; + out[3] = state[3][0]; + out[4] = state[0][1]; + out[5] = state[1][1]; + out[6] = state[2][1]; + out[7] = state[3][1]; + out[8] = state[0][2]; + out[9] = state[1][2]; + out[10] = state[2][2]; + out[11] = state[3][2]; + out[12] = state[0][3]; + out[13] = state[1][3]; + out[14] = state[2][3]; + out[15] = state[3][3]; +} + +// -------------------------------------------------- DES -------------------------------------------------- // + +/****************************** MACROS ******************************/ +// Obtain bit "b" from the left and shift it "c" places from the right +#define BITNUM(a,b,c) (((a[(b)/8] >> (7 - (b%8))) & 0x01) << (c)) +#define BITNUMINTR(a,b,c) ((((a) >> (31 - (b))) & 0x00000001) << (c)) +#define BITNUMINTL(a,b,c) ((((a) << (b)) & 0x80000000) >> (c)) + +// This macro converts a 6 bit block with the S-Box row defined as the first and last +// bits to a 6 bit block with the row defined by the first two bits. +#define SBOXBIT(a) (((a) & 0x20) | (((a) & 0x1f) >> 1) | (((a) & 0x01) << 4)) + +/**************************** VARIABLES *****************************/ +static const BYTE sbox1[64] = { + 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, + 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, + 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, + 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 +}; +static const BYTE sbox2[64] = { + 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, + 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, + 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, + 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 +}; +static const BYTE sbox3[64] = { + 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, + 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, + 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, + 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 +}; +static const BYTE sbox4[64] = { + 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, + 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, + 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, + 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 +}; +static const BYTE sbox5[64] = { + 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, + 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, + 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, + 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 +}; +static const BYTE sbox6[64] = { + 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, + 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, + 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, + 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 +}; +static const BYTE sbox7[64] = { + 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, + 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, + 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, + 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 +}; +static const BYTE sbox8[64] = { + 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, + 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, + 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, + 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 +}; + +/*********************** FUNCTION DEFINITIONS ***********************/ +// Initial (Inv)Permutation step +void IP(UINT state[], const BYTE in[]) +{ + state[0] = BITNUM(in,57,31) | BITNUM(in,49,30) | BITNUM(in,41,29) | BITNUM(in,33,28) | + BITNUM(in,25,27) | BITNUM(in,17,26) | BITNUM(in,9,25) | BITNUM(in,1,24) | + BITNUM(in,59,23) | BITNUM(in,51,22) | BITNUM(in,43,21) | BITNUM(in,35,20) | + BITNUM(in,27,19) | BITNUM(in,19,18) | BITNUM(in,11,17) | BITNUM(in,3,16) | + BITNUM(in,61,15) | BITNUM(in,53,14) | BITNUM(in,45,13) | BITNUM(in,37,12) | + BITNUM(in,29,11) | BITNUM(in,21,10) | BITNUM(in,13,9) | BITNUM(in,5,8) | + BITNUM(in,63,7) | BITNUM(in,55,6) | BITNUM(in,47,5) | BITNUM(in,39,4) | + BITNUM(in,31,3) | BITNUM(in,23,2) | BITNUM(in,15,1) | BITNUM(in,7,0); + + state[1] = BITNUM(in,56,31) | BITNUM(in,48,30) | BITNUM(in,40,29) | BITNUM(in,32,28) | + BITNUM(in,24,27) | BITNUM(in,16,26) | BITNUM(in,8,25) | BITNUM(in,0,24) | + BITNUM(in,58,23) | BITNUM(in,50,22) | BITNUM(in,42,21) | BITNUM(in,34,20) | + BITNUM(in,26,19) | BITNUM(in,18,18) | BITNUM(in,10,17) | BITNUM(in,2,16) | + BITNUM(in,60,15) | BITNUM(in,52,14) | BITNUM(in,44,13) | BITNUM(in,36,12) | + BITNUM(in,28,11) | BITNUM(in,20,10) | BITNUM(in,12,9) | BITNUM(in,4,8) | + BITNUM(in,62,7) | BITNUM(in,54,6) | BITNUM(in,46,5) | BITNUM(in,38,4) | + BITNUM(in,30,3) | BITNUM(in,22,2) | BITNUM(in,14,1) | BITNUM(in,6,0); +} + +void InvIP(UINT state[], BYTE in[]) +{ + in[0] = BITNUMINTR(state[1],7,7) | BITNUMINTR(state[0],7,6) | BITNUMINTR(state[1],15,5) | + BITNUMINTR(state[0],15,4) | BITNUMINTR(state[1],23,3) | BITNUMINTR(state[0],23,2) | + BITNUMINTR(state[1],31,1) | BITNUMINTR(state[0],31,0); + + in[1] = BITNUMINTR(state[1],6,7) | BITNUMINTR(state[0],6,6) | BITNUMINTR(state[1],14,5) | + BITNUMINTR(state[0],14,4) | BITNUMINTR(state[1],22,3) | BITNUMINTR(state[0],22,2) | + BITNUMINTR(state[1],30,1) | BITNUMINTR(state[0],30,0); + + in[2] = BITNUMINTR(state[1],5,7) | BITNUMINTR(state[0],5,6) | BITNUMINTR(state[1],13,5) | + BITNUMINTR(state[0],13,4) | BITNUMINTR(state[1],21,3) | BITNUMINTR(state[0],21,2) | + BITNUMINTR(state[1],29,1) | BITNUMINTR(state[0],29,0); + + in[3] = BITNUMINTR(state[1],4,7) | BITNUMINTR(state[0],4,6) | BITNUMINTR(state[1],12,5) | + BITNUMINTR(state[0],12,4) | BITNUMINTR(state[1],20,3) | BITNUMINTR(state[0],20,2) | + BITNUMINTR(state[1],28,1) | BITNUMINTR(state[0],28,0); + + in[4] = BITNUMINTR(state[1],3,7) | BITNUMINTR(state[0],3,6) | BITNUMINTR(state[1],11,5) | + BITNUMINTR(state[0],11,4) | BITNUMINTR(state[1],19,3) | BITNUMINTR(state[0],19,2) | + BITNUMINTR(state[1],27,1) | BITNUMINTR(state[0],27,0); + + in[5] = BITNUMINTR(state[1],2,7) | BITNUMINTR(state[0],2,6) | BITNUMINTR(state[1],10,5) | + BITNUMINTR(state[0],10,4) | BITNUMINTR(state[1],18,3) | BITNUMINTR(state[0],18,2) | + BITNUMINTR(state[1],26,1) | BITNUMINTR(state[0],26,0); + + in[6] = BITNUMINTR(state[1],1,7) | BITNUMINTR(state[0],1,6) | BITNUMINTR(state[1],9,5) | + BITNUMINTR(state[0],9,4) | BITNUMINTR(state[1],17,3) | BITNUMINTR(state[0],17,2) | + BITNUMINTR(state[1],25,1) | BITNUMINTR(state[0],25,0); + + in[7] = BITNUMINTR(state[1],0,7) | BITNUMINTR(state[0],0,6) | BITNUMINTR(state[1],8,5) | + BITNUMINTR(state[0],8,4) | BITNUMINTR(state[1],16,3) | BITNUMINTR(state[0],16,2) | + BITNUMINTR(state[1],24,1) | BITNUMINTR(state[0],24,0); +} + +UINT f(UINT state, const BYTE key[]) +{ + BYTE lrgstate[6]; //,i; + UINT t1,t2; + + // Expantion Permutation + t1 = BITNUMINTL(state,31,0) | ((state & 0xf0000000) >> 1) | BITNUMINTL(state,4,5) | + BITNUMINTL(state,3,6) | ((state & 0x0f000000) >> 3) | BITNUMINTL(state,8,11) | + BITNUMINTL(state,7,12) | ((state & 0x00f00000) >> 5) | BITNUMINTL(state,12,17) | + BITNUMINTL(state,11,18) | ((state & 0x000f0000) >> 7) | BITNUMINTL(state,16,23); + + t2 = BITNUMINTL(state,15,0) | ((state & 0x0000f000) << 15) | BITNUMINTL(state,20,5) | + BITNUMINTL(state,19,6) | ((state & 0x00000f00) << 13) | BITNUMINTL(state,24,11) | + BITNUMINTL(state,23,12) | ((state & 0x000000f0) << 11) | BITNUMINTL(state,28,17) | + BITNUMINTL(state,27,18) | ((state & 0x0000000f) << 9) | BITNUMINTL(state,0,23); + + lrgstate[0] = (t1 >> 24) & 0x000000ff; + lrgstate[1] = (t1 >> 16) & 0x000000ff; + lrgstate[2] = (t1 >> 8) & 0x000000ff; + lrgstate[3] = (t2 >> 24) & 0x000000ff; + lrgstate[4] = (t2 >> 16) & 0x000000ff; + lrgstate[5] = (t2 >> 8) & 0x000000ff; + + // Key XOR + lrgstate[0] ^= key[0]; + lrgstate[1] ^= key[1]; + lrgstate[2] ^= key[2]; + lrgstate[3] ^= key[3]; + lrgstate[4] ^= key[4]; + lrgstate[5] ^= key[5]; + + // S-Box Permutation + state = (sbox1[SBOXBIT(lrgstate[0] >> 2)] << 28) | + (sbox2[SBOXBIT(((lrgstate[0] & 0x03) << 4) | (lrgstate[1] >> 4))] << 24) | + (sbox3[SBOXBIT(((lrgstate[1] & 0x0f) << 2) | (lrgstate[2] >> 6))] << 20) | + (sbox4[SBOXBIT(lrgstate[2] & 0x3f)] << 16) | + (sbox5[SBOXBIT(lrgstate[3] >> 2)] << 12) | + (sbox6[SBOXBIT(((lrgstate[3] & 0x03) << 4) | (lrgstate[4] >> 4))] << 8) | + (sbox7[SBOXBIT(((lrgstate[4] & 0x0f) << 2) | (lrgstate[5] >> 6))] << 4) | + sbox8[SBOXBIT(lrgstate[5] & 0x3f)]; + + // P-Box Permutation + state = BITNUMINTL(state,15,0) | BITNUMINTL(state,6,1) | BITNUMINTL(state,19,2) | + BITNUMINTL(state,20,3) | BITNUMINTL(state,28,4) | BITNUMINTL(state,11,5) | + BITNUMINTL(state,27,6) | BITNUMINTL(state,16,7) | BITNUMINTL(state,0,8) | + BITNUMINTL(state,14,9) | BITNUMINTL(state,22,10) | BITNUMINTL(state,25,11) | + BITNUMINTL(state,4,12) | BITNUMINTL(state,17,13) | BITNUMINTL(state,30,14) | + BITNUMINTL(state,9,15) | BITNUMINTL(state,1,16) | BITNUMINTL(state,7,17) | + BITNUMINTL(state,23,18) | BITNUMINTL(state,13,19) | BITNUMINTL(state,31,20) | + BITNUMINTL(state,26,21) | BITNUMINTL(state,2,22) | BITNUMINTL(state,8,23) | + BITNUMINTL(state,18,24) | BITNUMINTL(state,12,25) | BITNUMINTL(state,29,26) | + BITNUMINTL(state,5,27) | BITNUMINTL(state,21,28) | BITNUMINTL(state,10,29) | + BITNUMINTL(state,3,30) | BITNUMINTL(state,24,31); + + // Return the final state value + return(state); +} + +void des_key_setup(const BYTE key[], BYTE schedule[][6], DES_MODE mode) +{ + UINT i, j, to_gen, C, D; + const UINT key_rnd_shift[16] = {1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1}; + const UINT key_perm_c[28] = {56,48,40,32,24,16,8,0,57,49,41,33,25,17, + 9,1,58,50,42,34,26,18,10,2,59,51,43,35}; + const UINT key_perm_d[28] = {62,54,46,38,30,22,14,6,61,53,45,37,29,21, + 13,5,60,52,44,36,28,20,12,4,27,19,11,3}; + const UINT key_compression[48] = {13,16,10,23,0,4,2,27,14,5,20,9, + 22,18,11,3,25,7,15,6,26,19,12,1, + 40,51,30,36,46,54,29,39,50,44,32,47, + 43,48,38,55,33,52,45,41,49,35,28,31}; + + // Permutated Choice #1 (copy the key in, ignoring parity bits). + for (i = 0, j = 31, C = 0; i < 28; ++i, --j) + C |= BITNUM(key,key_perm_c[i],j); + for (i = 0, j = 31, D = 0; i < 28; ++i, --j) + D |= BITNUM(key,key_perm_d[i],j); + + // Generate the 16 subkeys. + for (i = 0; i < 16; ++i) { + C = ((C << key_rnd_shift[i]) | (C >> (28-key_rnd_shift[i]))) & 0xfffffff0; + D = ((D << key_rnd_shift[i]) | (D >> (28-key_rnd_shift[i]))) & 0xfffffff0; + + // Decryption subkeys are reverse order of encryption subkeys so + // generate them in reverse if the key schedule is for decryption useage. + if (mode == DES_DECRYPT) + to_gen = 15 - i; + else /*(if mode == DES_ENCRYPT)*/ + to_gen = i; + // Initialize the array + for (j = 0; j < 6; ++j) + schedule[to_gen][j] = 0; + for (j = 0; j < 24; ++j) + schedule[to_gen][j/8] |= BITNUMINTR(C,key_compression[j],7 - (j%8)); + for ( ; j < 48; ++j) + schedule[to_gen][j/8] |= BITNUMINTR(D,key_compression[j] - 28,7 - (j%8)); + } +} + +void des_crypt(const BYTE in[], BYTE out[], const BYTE key[][6]) +{ + UINT state[2],idx,t; + + IP(state,in); + + for (idx=0; idx < 15; ++idx) { + t = state[1]; + state[1] = f(state[1],key[idx]) ^ state[0]; + state[0] = t; + } + // Perform the final loop manually as it doesn't switch sides + state[0] = f(state[1],key[15]) ^ state[0]; + + InvIP(state,out); +} + +void three_des_key_setup(const BYTE key[], BYTE schedule[][16][6], DES_MODE mode) +{ + if (mode == DES_ENCRYPT) { + des_key_setup(&key[0],schedule[0],mode); + des_key_setup(&key[8],schedule[1],(DES_MODE)(!mode)); + des_key_setup(&key[16],schedule[2],mode); + } + else /*if (mode == DES_DECRYPT*/ { + des_key_setup(&key[16],schedule[0],mode); + des_key_setup(&key[8],schedule[1],(DES_MODE)(!mode)); + des_key_setup(&key[0],schedule[2],mode); + } +} + +void three_des_crypt(const BYTE in[], BYTE out[], const BYTE key[][16][6]) +{ + des_crypt(in,out,key[0]); + des_crypt(out,out,key[1]); + des_crypt(out,out,key[2]); +} + +// -------------------------------------------------- MD2 -------------------------------------------------- // + +/**************************** VARIABLES *****************************/ +static const BYTE s[256] = { + 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, + 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, + 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, + 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, + 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, + 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, + 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, + 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, + 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, + 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, + 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, + 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, + 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, + 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, + 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, + 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, + 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, + 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 +}; + +/*********************** FUNCTION DEFINITIONS ***********************/ +void md2_transform(_MD2_CTX *ctx, BYTE data[]) +{ + int j,k,t; + + //memcpy(&ctx->state[16], data); + for (j=0; j < 16; ++j) { + ctx->state[j + 16] = data[j]; + ctx->state[j + 32] = (ctx->state[j+16] ^ ctx->state[j]); + } + + t = 0; + for (j = 0; j < 18; ++j) { + for (k = 0; k < 48; ++k) { + ctx->state[k] ^= s[t]; + t = ctx->state[k]; + } + t = (t+j) & 0xFF; + } + + t = ctx->checksum[15]; + for (j=0; j < 16; ++j) { + ctx->checksum[j] ^= s[data[j] ^ t]; + t = ctx->checksum[j]; + } +} + +void md2_init(_MD2_CTX *ctx) +{ + int i; + + for (i=0; i < 48; ++i) + ctx->state[i] = 0; + for (i=0; i < 16; ++i) + ctx->checksum[i] = 0; + ctx->len = 0; +} + +void md2_update(_MD2_CTX *ctx, const BYTE data[], size_t len) +{ + size_t i; + + for (i = 0; i < len; ++i) { + ctx->data[ctx->len] = data[i]; + ctx->len++; + if (ctx->len == MD2_BLOCK_SIZE) { + md2_transform(ctx, ctx->data); + ctx->len = 0; + } + } +} + +void md2_final(_MD2_CTX *ctx, BYTE hash[]) +{ + int to_pad; + + to_pad = MD2_BLOCK_SIZE - ctx->len; + + while (ctx->len < MD2_BLOCK_SIZE) + ctx->data[ctx->len++] = to_pad; + + md2_transform(ctx, ctx->data); + md2_transform(ctx, ctx->checksum); + + memcpy(hash, ctx->state, MD2_BLOCK_SIZE); +} + +// -------------------------------------------------- MD5 -------------------------------------------------- // + +/****************************** MACROS ******************************/ + +#define F(x,y,z) ((x & y) | (~x & z)) +#define G(x,y,z) ((x & z) | (y & ~z)) +#define H(x,y,z) (x ^ y ^ z) +#define I(x,y,z) (y ^ (x | ~z)) + +#define FF(a,b,c,d,m,s,t) { a += F(b,c,d) + m + t; \ + a = b + ROTLEFT(a,s); } +#define GG(a,b,c,d,m,s,t) { a += G(b,c,d) + m + t; \ + a = b + ROTLEFT(a,s); } +#define HH(a,b,c,d,m,s,t) { a += H(b,c,d) + m + t; \ + a = b + ROTLEFT(a,s); } +#define II(a,b,c,d,m,s,t) { a += I(b,c,d) + m + t; \ + a = b + ROTLEFT(a,s); } + +/*********************** FUNCTION DEFINITIONS ***********************/ +void md5_transform(_MD5_CTX *ctx, const BYTE data[]) +{ + UINT a, b, c, d, m[16], i, j; + + // MD5 specifies big endian byte order, but this implementation assumes a little + // endian byte order CPU. Reverse all the bytes upon input, and re-reverse them + // on output (in md5_final()). + for (i = 0, j = 0; i < 16; ++i, j += 4) + m[i] = (data[j]) + (data[j + 1] << 8) + (data[j + 2] << 16) + (data[j + 3] << 24); + + a = ctx->state[0]; + b = ctx->state[1]; + c = ctx->state[2]; + d = ctx->state[3]; + + FF(a,b,c,d,m[0], 7,0xd76aa478); + FF(d,a,b,c,m[1], 12,0xe8c7b756); + FF(c,d,a,b,m[2], 17,0x242070db); + FF(b,c,d,a,m[3], 22,0xc1bdceee); + FF(a,b,c,d,m[4], 7,0xf57c0faf); + FF(d,a,b,c,m[5], 12,0x4787c62a); + FF(c,d,a,b,m[6], 17,0xa8304613); + FF(b,c,d,a,m[7], 22,0xfd469501); + FF(a,b,c,d,m[8], 7,0x698098d8); + FF(d,a,b,c,m[9], 12,0x8b44f7af); + FF(c,d,a,b,m[10],17,0xffff5bb1); + FF(b,c,d,a,m[11],22,0x895cd7be); + FF(a,b,c,d,m[12], 7,0x6b901122); + FF(d,a,b,c,m[13],12,0xfd987193); + FF(c,d,a,b,m[14],17,0xa679438e); + FF(b,c,d,a,m[15],22,0x49b40821); + + GG(a,b,c,d,m[1], 5,0xf61e2562); + GG(d,a,b,c,m[6], 9,0xc040b340); + GG(c,d,a,b,m[11],14,0x265e5a51); + GG(b,c,d,a,m[0], 20,0xe9b6c7aa); + GG(a,b,c,d,m[5], 5,0xd62f105d); + GG(d,a,b,c,m[10], 9,0x02441453); + GG(c,d,a,b,m[15],14,0xd8a1e681); + GG(b,c,d,a,m[4], 20,0xe7d3fbc8); + GG(a,b,c,d,m[9], 5,0x21e1cde6); + GG(d,a,b,c,m[14], 9,0xc33707d6); + GG(c,d,a,b,m[3], 14,0xf4d50d87); + GG(b,c,d,a,m[8], 20,0x455a14ed); + GG(a,b,c,d,m[13], 5,0xa9e3e905); + GG(d,a,b,c,m[2], 9,0xfcefa3f8); + GG(c,d,a,b,m[7], 14,0x676f02d9); + GG(b,c,d,a,m[12],20,0x8d2a4c8a); + + HH(a,b,c,d,m[5], 4,0xfffa3942); + HH(d,a,b,c,m[8], 11,0x8771f681); + HH(c,d,a,b,m[11],16,0x6d9d6122); + HH(b,c,d,a,m[14],23,0xfde5380c); + HH(a,b,c,d,m[1], 4,0xa4beea44); + HH(d,a,b,c,m[4], 11,0x4bdecfa9); + HH(c,d,a,b,m[7], 16,0xf6bb4b60); + HH(b,c,d,a,m[10],23,0xbebfbc70); + HH(a,b,c,d,m[13], 4,0x289b7ec6); + HH(d,a,b,c,m[0], 11,0xeaa127fa); + HH(c,d,a,b,m[3], 16,0xd4ef3085); + HH(b,c,d,a,m[6], 23,0x04881d05); + HH(a,b,c,d,m[9], 4,0xd9d4d039); + HH(d,a,b,c,m[12],11,0xe6db99e5); + HH(c,d,a,b,m[15],16,0x1fa27cf8); + HH(b,c,d,a,m[2], 23,0xc4ac5665); + + II(a,b,c,d,m[0], 6,0xf4292244); + II(d,a,b,c,m[7], 10,0x432aff97); + II(c,d,a,b,m[14],15,0xab9423a7); + II(b,c,d,a,m[5], 21,0xfc93a039); + II(a,b,c,d,m[12], 6,0x655b59c3); + II(d,a,b,c,m[3], 10,0x8f0ccc92); + II(c,d,a,b,m[10],15,0xffeff47d); + II(b,c,d,a,m[1], 21,0x85845dd1); + II(a,b,c,d,m[8], 6,0x6fa87e4f); + II(d,a,b,c,m[15],10,0xfe2ce6e0); + II(c,d,a,b,m[6], 15,0xa3014314); + II(b,c,d,a,m[13],21,0x4e0811a1); + II(a,b,c,d,m[4], 6,0xf7537e82); + II(d,a,b,c,m[11],10,0xbd3af235); + II(c,d,a,b,m[2], 15,0x2ad7d2bb); + II(b,c,d,a,m[9], 21,0xeb86d391); + + ctx->state[0] += a; + ctx->state[1] += b; + ctx->state[2] += c; + ctx->state[3] += d; +} + +void md5_init(_MD5_CTX *ctx) +{ + ctx->datalen = 0; + ctx->bitlen = 0; + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; +} + +void md5_update(_MD5_CTX *ctx, const BYTE data[], size_t len) +{ + size_t i; + + for (i = 0; i < len; ++i) { + ctx->data[ctx->datalen] = data[i]; + ctx->datalen++; + if (ctx->datalen == 64) { + md5_transform(ctx, ctx->data); + ctx->bitlen += 512; + ctx->datalen = 0; + } + } +} + +void md5_final(_MD5_CTX *ctx, BYTE hash[]) +{ + size_t i; + + i = ctx->datalen; + + // Pad whatever data is left in the buffer. + if (ctx->datalen < 56) { + ctx->data[i++] = 0x80; + while (i < 56) + ctx->data[i++] = 0x00; + } + else if (ctx->datalen >= 56) { + ctx->data[i++] = 0x80; + while (i < 64) + ctx->data[i++] = 0x00; + md5_transform(ctx, ctx->data); + memset(ctx->data, 0, 56); + } + + // Append to the padding the total message's length in bits and transform. + ctx->bitlen += ctx->datalen * 8; + ctx->data[56] = (BYTE)(ctx->bitlen); + ctx->data[57] = (BYTE)(ctx->bitlen >> 8); + ctx->data[58] = (BYTE)(ctx->bitlen >> 16); + ctx->data[59] = (BYTE)(ctx->bitlen >> 24); + ctx->data[60] = (BYTE)(ctx->bitlen >> 32); + ctx->data[61] = (BYTE)(ctx->bitlen >> 40); + ctx->data[62] = (BYTE)(ctx->bitlen >> 48); + ctx->data[63] = (BYTE)(ctx->bitlen >> 56); + md5_transform(ctx, ctx->data); + + // Since this implementation uses little endian byte ordering and MD uses big endian, + // reverse all the bytes when copying the final state to the output hash. + for (i = 0; i < 4; ++i) { + hash[i] = (ctx->state[0] >> (i * 8)) & 0x000000ff; + hash[i + 4] = (ctx->state[1] >> (i * 8)) & 0x000000ff; + hash[i + 8] = (ctx->state[2] >> (i * 8)) & 0x000000ff; + hash[i + 12] = (ctx->state[3] >> (i * 8)) & 0x000000ff; + } +} + + +// -------------------------------------------------- SHA1 -------------------------------------------------- // + +/****************************** MACROS ******************************/ + + +/*********************** FUNCTION DEFINITIONS ***********************/ +void sha1_transform(_SHA1_CTX *ctx, const BYTE data[]) +{ + UINT a, b, c, d, e, i, j, t, m[80]; + + for (i = 0, j = 0; i < 16; ++i, j += 4) + m[i] = (data[j] << 24) + (data[j + 1] << 16) + (data[j + 2] << 8) + (data[j + 3]); + for ( ; i < 80; ++i) { + m[i] = (m[i - 3] ^ m[i - 8] ^ m[i - 14] ^ m[i - 16]); + m[i] = (m[i] << 1) | (m[i] >> 31); + } + + a = ctx->state[0]; + b = ctx->state[1]; + c = ctx->state[2]; + d = ctx->state[3]; + e = ctx->state[4]; + + for (i = 0; i < 20; ++i) { + t = ROTLEFT(a, 5) + ((b & c) ^ (~b & d)) + e + ctx->k[0] + m[i]; + e = d; + d = c; + c = ROTLEFT(b, 30); + b = a; + a = t; + } + for ( ; i < 40; ++i) { + t = ROTLEFT(a, 5) + (b ^ c ^ d) + e + ctx->k[1] + m[i]; + e = d; + d = c; + c = ROTLEFT(b, 30); + b = a; + a = t; + } + for ( ; i < 60; ++i) { + t = ROTLEFT(a, 5) + ((b & c) ^ (b & d) ^ (c & d)) + e + ctx->k[2] + m[i]; + e = d; + d = c; + c = ROTLEFT(b, 30); + b = a; + a = t; + } + for ( ; i < 80; ++i) { + t = ROTLEFT(a, 5) + (b ^ c ^ d) + e + ctx->k[3] + m[i]; + e = d; + d = c; + c = ROTLEFT(b, 30); + b = a; + a = t; + } + + ctx->state[0] += a; + ctx->state[1] += b; + ctx->state[2] += c; + ctx->state[3] += d; + ctx->state[4] += e; +} + +void sha1_init(_SHA1_CTX *ctx) +{ + ctx->datalen = 0; + ctx->bitlen = 0; + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0xc3d2e1f0; + ctx->k[0] = 0x5a827999; + ctx->k[1] = 0x6ed9eba1; + ctx->k[2] = 0x8f1bbcdc; + ctx->k[3] = 0xca62c1d6; +} + +void sha1_update(_SHA1_CTX *ctx, const BYTE data[], size_t len) +{ + size_t i; + + for (i = 0; i < len; ++i) { + ctx->data[ctx->datalen] = data[i]; + ctx->datalen++; + if (ctx->datalen == 64) { + sha1_transform(ctx, ctx->data); + ctx->bitlen += 512; + ctx->datalen = 0; + } + } +} + +void sha1_final(_SHA1_CTX *ctx, BYTE hash[]) +{ + UINT i; + + i = ctx->datalen; + + // Pad whatever data is left in the buffer. + if (ctx->datalen < 56) { + ctx->data[i++] = 0x80; + while (i < 56) + ctx->data[i++] = 0x00; + } + else { + ctx->data[i++] = 0x80; + while (i < 64) + ctx->data[i++] = 0x00; + sha1_transform(ctx, ctx->data); + memset(ctx->data, 0, 56); + } + + // Append to the padding the total message's length in bits and transform. + ctx->bitlen += ctx->datalen * 8; + ctx->data[63] = (BYTE)(ctx->bitlen); + ctx->data[62] = (BYTE)(ctx->bitlen >> 8); + ctx->data[61] = (BYTE)(ctx->bitlen >> 16); + ctx->data[60] = (BYTE)(ctx->bitlen >> 24); + ctx->data[59] = (BYTE)(ctx->bitlen >> 32); + ctx->data[58] = (BYTE)(ctx->bitlen >> 40); + ctx->data[57] = (BYTE)(ctx->bitlen >> 48); + ctx->data[56] = (BYTE)(ctx->bitlen >> 56); + sha1_transform(ctx, ctx->data); + + // Since this implementation uses little endian byte ordering and MD uses big endian, + // reverse all the bytes when copying the final state to the output hash. + for (i = 0; i < 4; ++i) { + hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff; + hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff; + hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff; + hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff; + hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff; + } +} + +// -------------------------------------------------- SHA256 -------------------------------------------------- // + +/****************************** MACROS ******************************/ + +#define CH(x,y,z) (((x) & (y)) ^ (~(x) & (z))) +#define MAJ(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z))) +#define EP0(x) (ROTRIGHT(x,2) ^ ROTRIGHT(x,13) ^ ROTRIGHT(x,22)) +#define EP1(x) (ROTRIGHT(x,6) ^ ROTRIGHT(x,11) ^ ROTRIGHT(x,25)) +#define SIG0(x) (ROTRIGHT(x,7) ^ ROTRIGHT(x,18) ^ ((x) >> 3)) +#define SIG1(x) (ROTRIGHT(x,17) ^ ROTRIGHT(x,19) ^ ((x) >> 10)) + +/**************************** VARIABLES *****************************/ +static const UINT k[64] = { + 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5, + 0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174, + 0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da, + 0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967, + 0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85, + 0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070, + 0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3, + 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 +}; + +/*********************** FUNCTION DEFINITIONS ***********************/ +void sha256_transform(_SHA256_CTX *ctx, const BYTE data[]) +{ + UINT a, b, c, d, e, f, g, h, i, j, t1, t2, m[64]; + + for (i = 0, j = 0; i < 16; ++i, j += 4) + m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]); + for ( ; i < 64; ++i) + m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16]; + + a = ctx->state[0]; + b = ctx->state[1]; + c = ctx->state[2]; + d = ctx->state[3]; + e = ctx->state[4]; + f = ctx->state[5]; + g = ctx->state[6]; + h = ctx->state[7]; + + for (i = 0; i < 64; ++i) { + t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i]; + t2 = EP0(a) + MAJ(a,b,c); + h = g; + g = f; + f = e; + e = d + t1; + d = c; + c = b; + b = a; + a = t1 + t2; + } + + ctx->state[0] += a; + ctx->state[1] += b; + ctx->state[2] += c; + ctx->state[3] += d; + ctx->state[4] += e; + ctx->state[5] += f; + ctx->state[6] += g; + ctx->state[7] += h; +} + +void sha256_init(_SHA256_CTX *ctx) +{ + ctx->datalen = 0; + ctx->bitlen = 0; + ctx->state[0] = 0x6a09e667; + ctx->state[1] = 0xbb67ae85; + ctx->state[2] = 0x3c6ef372; + ctx->state[3] = 0xa54ff53a; + ctx->state[4] = 0x510e527f; + ctx->state[5] = 0x9b05688c; + ctx->state[6] = 0x1f83d9ab; + ctx->state[7] = 0x5be0cd19; +} + +void sha256_update(_SHA256_CTX *ctx, const BYTE data[], size_t len) +{ + UINT i; + + for (i = 0; i < len; ++i) { + ctx->data[ctx->datalen] = data[i]; + ctx->datalen++; + if (ctx->datalen == 64) { + sha256_transform(ctx, ctx->data); + ctx->bitlen += 512; + ctx->datalen = 0; + } + } +} + +void sha256_final(_SHA256_CTX *ctx, BYTE hash[]) +{ + UINT i; + + i = ctx->datalen; + + // Pad whatever data is left in the buffer. + if (ctx->datalen < 56) { + ctx->data[i++] = 0x80; + while (i < 56) + ctx->data[i++] = 0x00; + } + else { + ctx->data[i++] = 0x80; + while (i < 64) + ctx->data[i++] = 0x00; + sha256_transform(ctx, ctx->data); + memset(ctx->data, 0, 56); + } + + // Append to the padding the total message's length in bits and transform. + ctx->bitlen += ctx->datalen * 8; + ctx->data[63] = (BYTE)(ctx->bitlen); + ctx->data[62] = (BYTE)(ctx->bitlen >> 8); + ctx->data[61] = (BYTE)(ctx->bitlen >> 16); + ctx->data[60] = (BYTE)(ctx->bitlen >> 24); + ctx->data[59] = (BYTE)(ctx->bitlen >> 32); + ctx->data[58] = (BYTE)(ctx->bitlen >> 40); + ctx->data[57] = (BYTE)(ctx->bitlen >> 48); + ctx->data[56] = (BYTE)(ctx->bitlen >> 56); + sha256_transform(ctx, ctx->data); + + // Since this implementation uses little endian byte ordering and SHA uses big endian, + // reverse all the bytes when copying the final state to the output hash. + for (i = 0; i < 4; ++i) { + hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff; + hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff; + hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff; + hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff; + hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff; + hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff; + hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff; + hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff; + } +} + +// -------------------------------------------------- ARCFOUR -------------------------------------------------- // + +/*********************** FUNCTION DEFINITIONS ***********************/ +void arcfour_key_setup(BYTE state[], const BYTE key[], int len) +{ + int i, j; + BYTE t; + + for (i = 0; i < 256; ++i) + state[i] = i; + for (i = 0, j = 0; i < 256; ++i) { + j = (j + state[i] + key[i % len]) % 256; + t = state[i]; + state[i] = state[j]; + state[j] = t; + } +} + +// This does not hold state between calls. It always generates the +// stream starting from the first output byte. +void arcfour_generate_stream(BYTE state[], BYTE out[], size_t len) +{ + int i, j; + size_t idx; + BYTE t; + + for (idx = 0, i = 0, j = 0; idx < len; ++idx) { + i = (i + 1) % 256; + j = (j + state[i]) % 256; + t = state[i]; + state[i] = state[j]; + state[j] = t; + out[idx] = state[(state[i] + state[j]) % 256]; + } +} + +// -------------------------------------------------- BLOWFISH -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define BF(x,t) t = keystruct->s[0][(x) >> 24]; \ + t += keystruct->s[1][((x) >> 16) & 0xff]; \ + t ^= keystruct->s[2][((x) >> 8) & 0xff]; \ + t += keystruct->s[3][(x) & 0xff]; +#define swap(r,l,t) t = l; l = r; r = t; +#define ITERATION(l,r,t,pval) l ^= keystruct->p[pval]; BF(l,t); r^= t; swap(r,l,t); + +/**************************** VARIABLES *****************************/ +static const UINT p_perm[18] = { + 0x243F6A88,0x85A308D3,0x13198A2E,0x03707344,0xA4093822,0x299F31D0,0x082EFA98, + 0xEC4E6C89,0x452821E6,0x38D01377,0xBE5466CF,0x34E90C6C,0xC0AC29B7,0xC97C50DD, + 0x3F84D5B5,0xB5470917,0x9216D5D9,0x8979FB1B +}; + +static const UINT s_perm[4][256] = { { + 0xD1310BA6,0x98DFB5AC,0x2FFD72DB,0xD01ADFB7,0xB8E1AFED,0x6A267E96,0xBA7C9045,0xF12C7F99, + 0x24A19947,0xB3916CF7,0x0801F2E2,0x858EFC16,0x636920D8,0x71574E69,0xA458FEA3,0xF4933D7E, + 0x0D95748F,0x728EB658,0x718BCD58,0x82154AEE,0x7B54A41D,0xC25A59B5,0x9C30D539,0x2AF26013, + 0xC5D1B023,0x286085F0,0xCA417918,0xB8DB38EF,0x8E79DCB0,0x603A180E,0x6C9E0E8B,0xB01E8A3E, + 0xD71577C1,0xBD314B27,0x78AF2FDA,0x55605C60,0xE65525F3,0xAA55AB94,0x57489862,0x63E81440, + 0x55CA396A,0x2AAB10B6,0xB4CC5C34,0x1141E8CE,0xA15486AF,0x7C72E993,0xB3EE1411,0x636FBC2A, + 0x2BA9C55D,0x741831F6,0xCE5C3E16,0x9B87931E,0xAFD6BA33,0x6C24CF5C,0x7A325381,0x28958677, + 0x3B8F4898,0x6B4BB9AF,0xC4BFE81B,0x66282193,0x61D809CC,0xFB21A991,0x487CAC60,0x5DEC8032, + 0xEF845D5D,0xE98575B1,0xDC262302,0xEB651B88,0x23893E81,0xD396ACC5,0x0F6D6FF3,0x83F44239, + 0x2E0B4482,0xA4842004,0x69C8F04A,0x9E1F9B5E,0x21C66842,0xF6E96C9A,0x670C9C61,0xABD388F0, + 0x6A51A0D2,0xD8542F68,0x960FA728,0xAB5133A3,0x6EEF0B6C,0x137A3BE4,0xBA3BF050,0x7EFB2A98, + 0xA1F1651D,0x39AF0176,0x66CA593E,0x82430E88,0x8CEE8619,0x456F9FB4,0x7D84A5C3,0x3B8B5EBE, + 0xE06F75D8,0x85C12073,0x401A449F,0x56C16AA6,0x4ED3AA62,0x363F7706,0x1BFEDF72,0x429B023D, + 0x37D0D724,0xD00A1248,0xDB0FEAD3,0x49F1C09B,0x075372C9,0x80991B7B,0x25D479D8,0xF6E8DEF7, + 0xE3FE501A,0xB6794C3B,0x976CE0BD,0x04C006BA,0xC1A94FB6,0x409F60C4,0x5E5C9EC2,0x196A2463, + 0x68FB6FAF,0x3E6C53B5,0x1339B2EB,0x3B52EC6F,0x6DFC511F,0x9B30952C,0xCC814544,0xAF5EBD09, + 0xBEE3D004,0xDE334AFD,0x660F2807,0x192E4BB3,0xC0CBA857,0x45C8740F,0xD20B5F39,0xB9D3FBDB, + 0x5579C0BD,0x1A60320A,0xD6A100C6,0x402C7279,0x679F25FE,0xFB1FA3CC,0x8EA5E9F8,0xDB3222F8, + 0x3C7516DF,0xFD616B15,0x2F501EC8,0xAD0552AB,0x323DB5FA,0xFD238760,0x53317B48,0x3E00DF82, + 0x9E5C57BB,0xCA6F8CA0,0x1A87562E,0xDF1769DB,0xD542A8F6,0x287EFFC3,0xAC6732C6,0x8C4F5573, + 0x695B27B0,0xBBCA58C8,0xE1FFA35D,0xB8F011A0,0x10FA3D98,0xFD2183B8,0x4AFCB56C,0x2DD1D35B, + 0x9A53E479,0xB6F84565,0xD28E49BC,0x4BFB9790,0xE1DDF2DA,0xA4CB7E33,0x62FB1341,0xCEE4C6E8, + 0xEF20CADA,0x36774C01,0xD07E9EFE,0x2BF11FB4,0x95DBDA4D,0xAE909198,0xEAAD8E71,0x6B93D5A0, + 0xD08ED1D0,0xAFC725E0,0x8E3C5B2F,0x8E7594B7,0x8FF6E2FB,0xF2122B64,0x8888B812,0x900DF01C, + 0x4FAD5EA0,0x688FC31C,0xD1CFF191,0xB3A8C1AD,0x2F2F2218,0xBE0E1777,0xEA752DFE,0x8B021FA1, + 0xE5A0CC0F,0xB56F74E8,0x18ACF3D6,0xCE89E299,0xB4A84FE0,0xFD13E0B7,0x7CC43B81,0xD2ADA8D9, + 0x165FA266,0x80957705,0x93CC7314,0x211A1477,0xE6AD2065,0x77B5FA86,0xC75442F5,0xFB9D35CF, + 0xEBCDAF0C,0x7B3E89A0,0xD6411BD3,0xAE1E7E49,0x00250E2D,0x2071B35E,0x226800BB,0x57B8E0AF, + 0x2464369B,0xF009B91E,0x5563911D,0x59DFA6AA,0x78C14389,0xD95A537F,0x207D5BA2,0x02E5B9C5, + 0x83260376,0x6295CFA9,0x11C81968,0x4E734A41,0xB3472DCA,0x7B14A94A,0x1B510052,0x9A532915, + 0xD60F573F,0xBC9BC6E4,0x2B60A476,0x81E67400,0x08BA6FB5,0x571BE91F,0xF296EC6B,0x2A0DD915, + 0xB6636521,0xE7B9F9B6,0xFF34052E,0xC5855664,0x53B02D5D,0xA99F8FA1,0x08BA4799,0x6E85076A +},{ + 0x4B7A70E9,0xB5B32944,0xDB75092E,0xC4192623,0xAD6EA6B0,0x49A7DF7D,0x9CEE60B8,0x8FEDB266, + 0xECAA8C71,0x699A17FF,0x5664526C,0xC2B19EE1,0x193602A5,0x75094C29,0xA0591340,0xE4183A3E, + 0x3F54989A,0x5B429D65,0x6B8FE4D6,0x99F73FD6,0xA1D29C07,0xEFE830F5,0x4D2D38E6,0xF0255DC1, + 0x4CDD2086,0x8470EB26,0x6382E9C6,0x021ECC5E,0x09686B3F,0x3EBAEFC9,0x3C971814,0x6B6A70A1, + 0x687F3584,0x52A0E286,0xB79C5305,0xAA500737,0x3E07841C,0x7FDEAE5C,0x8E7D44EC,0x5716F2B8, + 0xB03ADA37,0xF0500C0D,0xF01C1F04,0x0200B3FF,0xAE0CF51A,0x3CB574B2,0x25837A58,0xDC0921BD, + 0xD19113F9,0x7CA92FF6,0x94324773,0x22F54701,0x3AE5E581,0x37C2DADC,0xC8B57634,0x9AF3DDA7, + 0xA9446146,0x0FD0030E,0xECC8C73E,0xA4751E41,0xE238CD99,0x3BEA0E2F,0x3280BBA1,0x183EB331, + 0x4E548B38,0x4F6DB908,0x6F420D03,0xF60A04BF,0x2CB81290,0x24977C79,0x5679B072,0xBCAF89AF, + 0xDE9A771F,0xD9930810,0xB38BAE12,0xDCCF3F2E,0x5512721F,0x2E6B7124,0x501ADDE6,0x9F84CD87, + 0x7A584718,0x7408DA17,0xBC9F9ABC,0xE94B7D8C,0xEC7AEC3A,0xDB851DFA,0x63094366,0xC464C3D2, + 0xEF1C1847,0x3215D908,0xDD433B37,0x24C2BA16,0x12A14D43,0x2A65C451,0x50940002,0x133AE4DD, + 0x71DFF89E,0x10314E55,0x81AC77D6,0x5F11199B,0x043556F1,0xD7A3C76B,0x3C11183B,0x5924A509, + 0xF28FE6ED,0x97F1FBFA,0x9EBABF2C,0x1E153C6E,0x86E34570,0xEAE96FB1,0x860E5E0A,0x5A3E2AB3, + 0x771FE71C,0x4E3D06FA,0x2965DCB9,0x99E71D0F,0x803E89D6,0x5266C825,0x2E4CC978,0x9C10B36A, + 0xC6150EBA,0x94E2EA78,0xA5FC3C53,0x1E0A2DF4,0xF2F74EA7,0x361D2B3D,0x1939260F,0x19C27960, + 0x5223A708,0xF71312B6,0xEBADFE6E,0xEAC31F66,0xE3BC4595,0xA67BC883,0xB17F37D1,0x018CFF28, + 0xC332DDEF,0xBE6C5AA5,0x65582185,0x68AB9802,0xEECEA50F,0xDB2F953B,0x2AEF7DAD,0x5B6E2F84, + 0x1521B628,0x29076170,0xECDD4775,0x619F1510,0x13CCA830,0xEB61BD96,0x0334FE1E,0xAA0363CF, + 0xB5735C90,0x4C70A239,0xD59E9E0B,0xCBAADE14,0xEECC86BC,0x60622CA7,0x9CAB5CAB,0xB2F3846E, + 0x648B1EAF,0x19BDF0CA,0xA02369B9,0x655ABB50,0x40685A32,0x3C2AB4B3,0x319EE9D5,0xC021B8F7, + 0x9B540B19,0x875FA099,0x95F7997E,0x623D7DA8,0xF837889A,0x97E32D77,0x11ED935F,0x16681281, + 0x0E358829,0xC7E61FD6,0x96DEDFA1,0x7858BA99,0x57F584A5,0x1B227263,0x9B83C3FF,0x1AC24696, + 0xCDB30AEB,0x532E3054,0x8FD948E4,0x6DBC3128,0x58EBF2EF,0x34C6FFEA,0xFE28ED61,0xEE7C3C73, + 0x5D4A14D9,0xE864B7E3,0x42105D14,0x203E13E0,0x45EEE2B6,0xA3AAABEA,0xDB6C4F15,0xFACB4FD0, + 0xC742F442,0xEF6ABBB5,0x654F3B1D,0x41CD2105,0xD81E799E,0x86854DC7,0xE44B476A,0x3D816250, + 0xCF62A1F2,0x5B8D2646,0xFC8883A0,0xC1C7B6A3,0x7F1524C3,0x69CB7492,0x47848A0B,0x5692B285, + 0x095BBF00,0xAD19489D,0x1462B174,0x23820E00,0x58428D2A,0x0C55F5EA,0x1DADF43E,0x233F7061, + 0x3372F092,0x8D937E41,0xD65FECF1,0x6C223BDB,0x7CDE3759,0xCBEE7460,0x4085F2A7,0xCE77326E, + 0xA6078084,0x19F8509E,0xE8EFD855,0x61D99735,0xA969A7AA,0xC50C06C2,0x5A04ABFC,0x800BCADC, + 0x9E447A2E,0xC3453484,0xFDD56705,0x0E1E9EC9,0xDB73DBD3,0x105588CD,0x675FDA79,0xE3674340, + 0xC5C43465,0x713E38D8,0x3D28F89E,0xF16DFF20,0x153E21E7,0x8FB03D4A,0xE6E39F2B,0xDB83ADF7 +},{ + 0xE93D5A68,0x948140F7,0xF64C261C,0x94692934,0x411520F7,0x7602D4F7,0xBCF46B2E,0xD4A20068, + 0xD4082471,0x3320F46A,0x43B7D4B7,0x500061AF,0x1E39F62E,0x97244546,0x14214F74,0xBF8B8840, + 0x4D95FC1D,0x96B591AF,0x70F4DDD3,0x66A02F45,0xBFBC09EC,0x03BD9785,0x7FAC6DD0,0x31CB8504, + 0x96EB27B3,0x55FD3941,0xDA2547E6,0xABCA0A9A,0x28507825,0x530429F4,0x0A2C86DA,0xE9B66DFB, + 0x68DC1462,0xD7486900,0x680EC0A4,0x27A18DEE,0x4F3FFEA2,0xE887AD8C,0xB58CE006,0x7AF4D6B6, + 0xAACE1E7C,0xD3375FEC,0xCE78A399,0x406B2A42,0x20FE9E35,0xD9F385B9,0xEE39D7AB,0x3B124E8B, + 0x1DC9FAF7,0x4B6D1856,0x26A36631,0xEAE397B2,0x3A6EFA74,0xDD5B4332,0x6841E7F7,0xCA7820FB, + 0xFB0AF54E,0xD8FEB397,0x454056AC,0xBA489527,0x55533A3A,0x20838D87,0xFE6BA9B7,0xD096954B, + 0x55A867BC,0xA1159A58,0xCCA92963,0x99E1DB33,0xA62A4A56,0x3F3125F9,0x5EF47E1C,0x9029317C, + 0xFDF8E802,0x04272F70,0x80BB155C,0x05282CE3,0x95C11548,0xE4C66D22,0x48C1133F,0xC70F86DC, + 0x07F9C9EE,0x41041F0F,0x404779A4,0x5D886E17,0x325F51EB,0xD59BC0D1,0xF2BCC18F,0x41113564, + 0x257B7834,0x602A9C60,0xDFF8E8A3,0x1F636C1B,0x0E12B4C2,0x02E1329E,0xAF664FD1,0xCAD18115, + 0x6B2395E0,0x333E92E1,0x3B240B62,0xEEBEB922,0x85B2A20E,0xE6BA0D99,0xDE720C8C,0x2DA2F728, + 0xD0127845,0x95B794FD,0x647D0862,0xE7CCF5F0,0x5449A36F,0x877D48FA,0xC39DFD27,0xF33E8D1E, + 0x0A476341,0x992EFF74,0x3A6F6EAB,0xF4F8FD37,0xA812DC60,0xA1EBDDF8,0x991BE14C,0xDB6E6B0D, + 0xC67B5510,0x6D672C37,0x2765D43B,0xDCD0E804,0xF1290DC7,0xCC00FFA3,0xB5390F92,0x690FED0B, + 0x667B9FFB,0xCEDB7D9C,0xA091CF0B,0xD9155EA3,0xBB132F88,0x515BAD24,0x7B9479BF,0x763BD6EB, + 0x37392EB3,0xCC115979,0x8026E297,0xF42E312D,0x6842ADA7,0xC66A2B3B,0x12754CCC,0x782EF11C, + 0x6A124237,0xB79251E7,0x06A1BBE6,0x4BFB6350,0x1A6B1018,0x11CAEDFA,0x3D25BDD8,0xE2E1C3C9, + 0x44421659,0x0A121386,0xD90CEC6E,0xD5ABEA2A,0x64AF674E,0xDA86A85F,0xBEBFE988,0x64E4C3FE, + 0x9DBC8057,0xF0F7C086,0x60787BF8,0x6003604D,0xD1FD8346,0xF6381FB0,0x7745AE04,0xD736FCCC, + 0x83426B33,0xF01EAB71,0xB0804187,0x3C005E5F,0x77A057BE,0xBDE8AE24,0x55464299,0xBF582E61, + 0x4E58F48F,0xF2DDFDA2,0xF474EF38,0x8789BDC2,0x5366F9C3,0xC8B38E74,0xB475F255,0x46FCD9B9, + 0x7AEB2661,0x8B1DDF84,0x846A0E79,0x915F95E2,0x466E598E,0x20B45770,0x8CD55591,0xC902DE4C, + 0xB90BACE1,0xBB8205D0,0x11A86248,0x7574A99E,0xB77F19B6,0xE0A9DC09,0x662D09A1,0xC4324633, + 0xE85A1F02,0x09F0BE8C,0x4A99A025,0x1D6EFE10,0x1AB93D1D,0x0BA5A4DF,0xA186F20F,0x2868F169, + 0xDCB7DA83,0x573906FE,0xA1E2CE9B,0x4FCD7F52,0x50115E01,0xA70683FA,0xA002B5C4,0x0DE6D027, + 0x9AF88C27,0x773F8641,0xC3604C06,0x61A806B5,0xF0177A28,0xC0F586E0,0x006058AA,0x30DC7D62, + 0x11E69ED7,0x2338EA63,0x53C2DD94,0xC2C21634,0xBBCBEE56,0x90BCB6DE,0xEBFC7DA1,0xCE591D76, + 0x6F05E409,0x4B7C0188,0x39720A3D,0x7C927C24,0x86E3725F,0x724D9DB9,0x1AC15BB4,0xD39EB8FC, + 0xED545578,0x08FCA5B5,0xD83D7CD3,0x4DAD0FC4,0x1E50EF5E,0xB161E6F8,0xA28514D9,0x6C51133C, + 0x6FD5C7E7,0x56E14EC4,0x362ABFCE,0xDDC6C837,0xD79A3234,0x92638212,0x670EFA8E,0x406000E0 + },{ + 0x3A39CE37,0xD3FAF5CF,0xABC27737,0x5AC52D1B,0x5CB0679E,0x4FA33742,0xD3822740,0x99BC9BBE, + 0xD5118E9D,0xBF0F7315,0xD62D1C7E,0xC700C47B,0xB78C1B6B,0x21A19045,0xB26EB1BE,0x6A366EB4, + 0x5748AB2F,0xBC946E79,0xC6A376D2,0x6549C2C8,0x530FF8EE,0x468DDE7D,0xD5730A1D,0x4CD04DC6, + 0x2939BBDB,0xA9BA4650,0xAC9526E8,0xBE5EE304,0xA1FAD5F0,0x6A2D519A,0x63EF8CE2,0x9A86EE22, + 0xC089C2B8,0x43242EF6,0xA51E03AA,0x9CF2D0A4,0x83C061BA,0x9BE96A4D,0x8FE51550,0xBA645BD6, + 0x2826A2F9,0xA73A3AE1,0x4BA99586,0xEF5562E9,0xC72FEFD3,0xF752F7DA,0x3F046F69,0x77FA0A59, + 0x80E4A915,0x87B08601,0x9B09E6AD,0x3B3EE593,0xE990FD5A,0x9E34D797,0x2CF0B7D9,0x022B8B51, + 0x96D5AC3A,0x017DA67D,0xD1CF3ED6,0x7C7D2D28,0x1F9F25CF,0xADF2B89B,0x5AD6B472,0x5A88F54C, + 0xE029AC71,0xE019A5E6,0x47B0ACFD,0xED93FA9B,0xE8D3C48D,0x283B57CC,0xF8D56629,0x79132E28, + 0x785F0191,0xED756055,0xF7960E44,0xE3D35E8C,0x15056DD4,0x88F46DBA,0x03A16125,0x0564F0BD, + 0xC3EB9E15,0x3C9057A2,0x97271AEC,0xA93A072A,0x1B3F6D9B,0x1E6321F5,0xF59C66FB,0x26DCF319, + 0x7533D928,0xB155FDF5,0x03563482,0x8ABA3CBB,0x28517711,0xC20AD9F8,0xABCC5167,0xCCAD925F, + 0x4DE81751,0x3830DC8E,0x379D5862,0x9320F991,0xEA7A90C2,0xFB3E7BCE,0x5121CE64,0x774FBE32, + 0xA8B6E37E,0xC3293D46,0x48DE5369,0x6413E680,0xA2AE0810,0xDD6DB224,0x69852DFD,0x09072166, + 0xB39A460A,0x6445C0DD,0x586CDECF,0x1C20C8AE,0x5BBEF7DD,0x1B588D40,0xCCD2017F,0x6BB4E3BB, + 0xDDA26A7E,0x3A59FF45,0x3E350A44,0xBCB4CDD5,0x72EACEA8,0xFA6484BB,0x8D6612AE,0xBF3C6F47, + 0xD29BE463,0x542F5D9E,0xAEC2771B,0xF64E6370,0x740E0D8D,0xE75B1357,0xF8721671,0xAF537D5D, + 0x4040CB08,0x4EB4E2CC,0x34D2466A,0x0115AF84,0xE1B00428,0x95983A1D,0x06B89FB4,0xCE6EA048, + 0x6F3F3B82,0x3520AB82,0x011A1D4B,0x277227F8,0x611560B1,0xE7933FDC,0xBB3A792B,0x344525BD, + 0xA08839E1,0x51CE794B,0x2F32C9B7,0xA01FBAC9,0xE01CC87E,0xBCC7D1F6,0xCF0111C3,0xA1E8AAC7, + 0x1A908749,0xD44FBD9A,0xD0DADECB,0xD50ADA38,0x0339C32A,0xC6913667,0x8DF9317C,0xE0B12B4F, + 0xF79E59B7,0x43F5BB3A,0xF2D519FF,0x27D9459C,0xBF97222C,0x15E6FC2A,0x0F91FC71,0x9B941525, + 0xFAE59361,0xCEB69CEB,0xC2A86459,0x12BAA8D1,0xB6C1075E,0xE3056A0C,0x10D25065,0xCB03A442, + 0xE0EC6E0E,0x1698DB3B,0x4C98A0BE,0x3278E964,0x9F1F9532,0xE0D392DF,0xD3A0342B,0x8971F21E, + 0x1B0A7441,0x4BA3348C,0xC5BE7120,0xC37632D8,0xDF359F8D,0x9B992F2E,0xE60B6F47,0x0FE3F11D, + 0xE54CDA54,0x1EDAD891,0xCE6279CF,0xCD3E7E6F,0x1618B166,0xFD2C1D05,0x848FD2C5,0xF6FB2299, + 0xF523F357,0xA6327623,0x93A83531,0x56CCCD02,0xACF08162,0x5A75EBB5,0x6E163697,0x88D273CC, + 0xDE966292,0x81B949D0,0x4C50901B,0x71C65614,0xE6C6C7BD,0x327A140A,0x45E1D006,0xC3F27B9A, + 0xC9AA53FD,0x62A80F00,0xBB25BFE2,0x35BDD2F6,0x71126905,0xB2040222,0xB6CBCF7C,0xCD769C2B, + 0x53113EC0,0x1640E3D3,0x38ABBD60,0x2547ADF0,0xBA38209C,0xF746CE76,0x77AFA1C5,0x20756060, + 0x85CBFE4E,0x8AE88DD8,0x7AAAF9B0,0x4CF9AA7E,0x1948C25C,0x02FB8A8C,0x01C36AE4,0xD6EBE1F9, + 0x90D4F869,0xA65CDEA0,0x3F09252D,0xC208E69F,0xB74E6132,0xCE77E25B,0x578FDFE3,0x3AC372E6 +} }; + +/*********************** FUNCTION DEFINITIONS ***********************/ +void blowfish_encrypt(const BYTE in[], BYTE out[], const _BLOWFISH_KEY *keystruct) +{ + UINT l,r,t; //,i; + + l = (in[0] << 24) | (in[1] << 16) | (in[2] << 8) | (in[3]); + r = (in[4] << 24) | (in[5] << 16) | (in[6] << 8) | (in[7]); + + ITERATION(l,r,t,0); + ITERATION(l,r,t,1); + ITERATION(l,r,t,2); + ITERATION(l,r,t,3); + ITERATION(l,r,t,4); + ITERATION(l,r,t,5); + ITERATION(l,r,t,6); + ITERATION(l,r,t,7); + ITERATION(l,r,t,8); + ITERATION(l,r,t,9); + ITERATION(l,r,t,10); + ITERATION(l,r,t,11); + ITERATION(l,r,t,12); + ITERATION(l,r,t,13); + ITERATION(l,r,t,14); + l ^= keystruct->p[15]; BF(l,t); r^= t; //Last iteration has no swap() + r ^= keystruct->p[16]; + l ^= keystruct->p[17]; + + out[0] = l >> 24; + out[1] = l >> 16; + out[2] = l >> 8; + out[3] = l; + out[4] = r >> 24; + out[5] = r >> 16; + out[6] = r >> 8; + out[7] = r; +} + +void blowfish_decrypt(const BYTE in[], BYTE out[], const _BLOWFISH_KEY *keystruct) +{ + UINT l,r,t; //,i; + + l = (in[0] << 24) | (in[1] << 16) | (in[2] << 8) | (in[3]); + r = (in[4] << 24) | (in[5] << 16) | (in[6] << 8) | (in[7]); + + ITERATION(l,r,t,17); + ITERATION(l,r,t,16); + ITERATION(l,r,t,15); + ITERATION(l,r,t,14); + ITERATION(l,r,t,13); + ITERATION(l,r,t,12); + ITERATION(l,r,t,11); + ITERATION(l,r,t,10); + ITERATION(l,r,t,9); + ITERATION(l,r,t,8); + ITERATION(l,r,t,7); + ITERATION(l,r,t,6); + ITERATION(l,r,t,5); + ITERATION(l,r,t,4); + ITERATION(l,r,t,3); + l ^= keystruct->p[2]; BF(l,t); r^= t; //Last iteration has no swap() + r ^= keystruct->p[1]; + l ^= keystruct->p[0]; + + out[0] = l >> 24; + out[1] = l >> 16; + out[2] = l >> 8; + out[3] = l; + out[4] = r >> 24; + out[5] = r >> 16; + out[6] = r >> 8; + out[7] = r; +} + +void blowfish_key_setup(const BYTE user_key[], _BLOWFISH_KEY *keystruct, size_t len) +{ + BYTE block[8]; + int idx,idx2; + + // Copy over the constant init array vals (so the originals aren't destroyed). + memcpy(keystruct->p,p_perm,sizeof(UINT) * 18); + memcpy(keystruct->s,s_perm,sizeof(UINT) * 1024); + + // Combine the key with the P box. Assume key is standard 448 bits (56 bytes) or less. + for (idx = 0, idx2 = 0; idx < 18; ++idx, idx2 += 4) + keystruct->p[idx] ^= (user_key[idx2 % len] << 24) | (user_key[(idx2+1) % len] << 16) + | (user_key[(idx2+2) % len] << 8) | (user_key[(idx2+3) % len]); + // Re-calculate the P box. + memset(block, 0, 8); + for (idx = 0; idx < 18; idx += 2) { + blowfish_encrypt(block,block,keystruct); + keystruct->p[idx] = (block[0] << 24) | (block[1] << 16) | (block[2] << 8) | block[3]; + keystruct->p[idx+1]=(block[4] << 24) | (block[5] << 16) | (block[6] << 8) | block[7]; + } + // Recalculate the S-boxes. + for (idx = 0; idx < 4; ++idx) { + for (idx2 = 0; idx2 < 256; idx2 += 2) { + blowfish_encrypt(block,block,keystruct); + keystruct->s[idx][idx2] = (block[0] << 24) | (block[1] << 16) | + (block[2] << 8) | block[3]; + keystruct->s[idx][idx2+1] = (block[4] << 24) | (block[5] << 16) | + (block[6] << 8) | block[7]; + } + } +} + +// -------------------------------------------------- ROT-13 -------------------------------------------------- // + +/*********************** FUNCTION DEFINITIONS ***********************/ +void rot13(char str[]) +{ + int case_type, idx, len; + + for (idx = 0, len = (int)strlen(str); idx < len; idx++) { + // Only process alphabetic characters. + if (str[idx] < 'A' || (str[idx] > 'Z' && str[idx] < 'a') || str[idx] > 'z') + continue; + // Determine if the char is upper or lower case. + if (str[idx] >= 'a') + case_type = 'a'; + else + case_type = 'A'; + // Rotate the char's value, ensuring it doesn't accidentally "fall off" the end. + str[idx] = (str[idx] + 13) % (case_type + 26); + if (str[idx] < 26) + str[idx] += case_type; + } +} + +#ifdef __GNUC__ + #pragma GCC diagnostic pop +#endif diff --git a/common/crypto/Crypto.h b/common/crypto/Crypto.h new file mode 100644 index 0000000..42e13f0 --- /dev/null +++ b/common/crypto/Crypto.h @@ -0,0 +1,258 @@ +#pragma once + +#include "../../hpsocket/GlobalDef.h" + +#include + +// -------------------------------------------------- BASE64 -------------------------------------------------- // + +// Returns the size of the output. If called with out = NULL, will just return +// the size of what the output would have been (without a terminating NULL). +size_t base64_encode(const BYTE in[], BYTE out[], size_t len, int newline_flag); + +// Returns the size of the output. If called with out = NULL, will just return +// the size of what the output would have been (without a terminating NULL). +size_t base64_decode(const BYTE in[], BYTE out[], size_t len); + +// -------------------------------------------------- URL -------------------------------------------------- // + +int url_encode(const char* src, const int src_size, char* dest, const int dest_size); +int url_decode(const char* src, const int src_size, char* dest, const int dest_size); + +// -------------------------------------------------- AES -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define AES_BLOCK_SIZE 16 // AES operates on 16 bytes at a time + +/**************************** DATA TYPES ****************************/ +//typedef unsigned char BYTE; // 8-bit byte +//typedef unsigned int UINT; // 32-bit word, change to "long" for 16-bit machines + +/*********************** FUNCTION DECLARATIONS **********************/ +/////////////////// +// AES +/////////////////// +// Key setup must be done before any AES en/de-cryption functions can be used. +void aes_key_setup(const BYTE key[], // The key, must be 128, 192, or 256 bits + UINT w[], // Output key schedule to be used later + int keysize); // Bit length of the key, 128, 192, or 256 + +void aes_encrypt(const BYTE in[], // 16 bytes of plaintext + BYTE out[], // 16 bytes of ciphertext + const UINT key[], // From the key setup + int keysize); // Bit length of the key, 128, 192, or 256 + +void aes_decrypt(const BYTE in[], // 16 bytes of ciphertext + BYTE out[], // 16 bytes of plaintext + const UINT key[], // From the key setup + int keysize); // Bit length of the key, 128, 192, or 256 + +/////////////////// +// AES - CBC +/////////////////// +int aes_encrypt_cbc(const BYTE in[], // Plaintext + size_t in_len, // Must be a multiple of AES_BLOCK_SIZE + BYTE out[], // Ciphertext, same length as plaintext + const UINT key[], // From the key setup + int keysize, // Bit length of the key, 128, 192, or 256 + const BYTE iv[]); // IV, must be AES_BLOCK_SIZE bytes long + +// Only output the CBC-MAC of the input. +int aes_encrypt_cbc_mac(const BYTE in[], // plaintext + size_t in_len, // Must be a multiple of AES_BLOCK_SIZE + BYTE out[], // Output MAC + const UINT key[], // From the key setup + int keysize, // Bit length of the key, 128, 192, or 256 + const BYTE iv[]); // IV, must be AES_BLOCK_SIZE bytes long + +/////////////////// +// AES - CTR +/////////////////// +void increment_iv(BYTE iv[], // Must be a multiple of AES_BLOCK_SIZE + int counter_size); // Bytes of the IV used for counting (low end) + +void aes_encrypt_ctr(const BYTE in[], // Plaintext + size_t in_len, // Any byte length + BYTE out[], // Ciphertext, same length as plaintext + const UINT key[], // From the key setup + int keysize, // Bit length of the key, 128, 192, or 256 + const BYTE iv[]); // IV, must be AES_BLOCK_SIZE bytes long + +void aes_decrypt_ctr(const BYTE in[], // Ciphertext + size_t in_len, // Any byte length + BYTE out[], // Plaintext, same length as ciphertext + const UINT key[], // From the key setup + int keysize, // Bit length of the key, 128, 192, or 256 + const BYTE iv[]); // IV, must be AES_BLOCK_SIZE bytes long + +/////////////////// +// AES - CCM +/////////////////// +// Returns True if the input parameters do not violate any constraint. +int aes_encrypt_ccm(const BYTE plaintext[], // IN - Plaintext. + UINT plaintext_len, // IN - Plaintext length. + const BYTE associated_data[], // IN - Associated Data included in authentication, but not encryption. + unsigned short associated_data_len, // IN - Associated Data length in bytes. + const BYTE nonce[], // IN - The Nonce to be used for encryption. + unsigned short nonce_len, // IN - Nonce length in bytes. + BYTE ciphertext[], // OUT - Ciphertext, a concatination of the plaintext and the MAC. + UINT *ciphertext_len, // OUT - The length of the ciphertext, always plaintext_len + mac_len. + UINT mac_len, // IN - The desired length of the MAC, must be 4, 6, 8, 10, 12, 14, or 16. + const BYTE key[], // IN - The AES key for encryption. + int keysize); // IN - The length of the key in bits. Valid values are 128, 192, 256. + +// Returns True if the input parameters do not violate any constraint. +// Use mac_auth to ensure decryption/validation was preformed correctly. +// If authentication does not succeed, the plaintext is zeroed out. To overwride +// this, call with mac_auth = NULL. The proper proceedure is to decrypt with +// authentication enabled (mac_auth != NULL) and make a second call to that +// ignores authentication explicitly if the first call failes. +int aes_decrypt_ccm(const BYTE ciphertext[], // IN - Ciphertext, the concatination of encrypted plaintext and MAC. + UINT ciphertext_len, // IN - Ciphertext length in bytes. + const BYTE assoc[], // IN - The Associated Data, required for authentication. + unsigned short assoc_len, // IN - Associated Data length in bytes. + const BYTE nonce[], // IN - The Nonce to use for decryption, same one as for encryption. + unsigned short nonce_len, // IN - Nonce length in bytes. + BYTE plaintext[], // OUT - The plaintext that was decrypted. Will need to be large enough to hold ciphertext_len - mac_len. + UINT *plaintext_len, // OUT - Length in bytes of the output plaintext, always ciphertext_len - mac_len . + UINT mac_len, // IN - The length of the MAC that was calculated. + int *mac_auth, // OUT - TRUE if authentication succeeded, FALSE if it did not. NULL pointer will ignore the authentication. + const BYTE key[], // IN - The AES key for decryption. + int keysize); // IN - The length of the key in BITS. Valid values are 128, 192, 256. + +// -------------------------------------------------- DES -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define DES_BLOCK_SIZE 8 // DES operates on 8 bytes at a time + +/**************************** DATA TYPES ****************************/ + +typedef enum { + DES_ENCRYPT, + DES_DECRYPT +} DES_MODE; + +/*********************** FUNCTION DECLARATIONS **********************/ +void des_key_setup(const BYTE key[], BYTE schedule[][6], DES_MODE mode); +void des_crypt(const BYTE in[], BYTE out[], const BYTE key[][6]); + +void three_des_key_setup(const BYTE key[], BYTE schedule[][16][6], DES_MODE mode); +void three_des_crypt(const BYTE in[], BYTE out[], const BYTE key[][16][6]); + +// -------------------------------------------------- MD2 -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define MD2_BLOCK_SIZE 16 + +/**************************** DATA TYPES ****************************/ + +typedef struct { + BYTE data[16]; + BYTE state[48]; + BYTE checksum[16]; + int len; +} _MD2_CTX; + +/*********************** FUNCTION DECLARATIONS **********************/ +void md2_init(_MD2_CTX *ctx); +void md2_update(_MD2_CTX *ctx, const BYTE data[], size_t len); +void md2_final(_MD2_CTX *ctx, BYTE hash[]); // size of hash must be MD2_BLOCK_SIZE + +// -------------------------------------------------- MD5 -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define MD5_BLOCK_SIZE 16 // MD5 outputs a 16 byte digest + +/**************************** DATA TYPES ****************************/ + +typedef struct { + BYTE data[64]; + UINT datalen; + unsigned long long bitlen; + UINT state[4]; +} _MD5_CTX; + +/*********************** FUNCTION DECLARATIONS **********************/ +void md5_init(_MD5_CTX *ctx); +void md5_update(_MD5_CTX *ctx, const BYTE data[], size_t len); +void md5_final(_MD5_CTX *ctx, BYTE hash[]); + +// -------------------------------------------------- SHA1 -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define SHA1_BLOCK_SIZE 20 // SHA1 outputs a 20 byte digest + +/**************************** DATA TYPES ****************************/ + +typedef struct { + BYTE data[64]; + UINT datalen; + unsigned long long bitlen; + UINT state[5]; + UINT k[4]; +} _SHA1_CTX; + +/*********************** FUNCTION DECLARATIONS **********************/ + +void sha1_init(_SHA1_CTX *ctx); +void sha1_update(_SHA1_CTX *ctx, const BYTE data[], size_t len); +void sha1_final(_SHA1_CTX *ctx, BYTE hash[]); + +// -------------------------------------------------- SHA256 -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest + +/**************************** DATA TYPES ****************************/ + +typedef struct { + BYTE data[64]; + UINT datalen; + unsigned long long bitlen; + UINT state[8]; +} _SHA256_CTX; + +/*********************** FUNCTION DECLARATIONS **********************/ +void sha256_init(_SHA256_CTX *ctx); +void sha256_update(_SHA256_CTX *ctx, const BYTE data[], size_t len); +void sha256_final(_SHA256_CTX *ctx, BYTE hash[]); + +// -------------------------------------------------- ARCFOUR -------------------------------------------------- // + +/**************************** DATA TYPES ****************************/ + +/*********************** FUNCTION DECLARATIONS **********************/ +// Input: state - the state used to generate the keystream +// key - Key to use to initialize the state +// len - length of key in bytes (valid lenth is 1 to 256) +void arcfour_key_setup(BYTE state[], const BYTE key[], int len); + +// Pseudo-Random Generator Algorithm +// Input: state - the state used to generate the keystream +// out - Must be allocated to be of at least "len" length +// len - number of bytes to generate +void arcfour_generate_stream(BYTE state[], BYTE out[], size_t len); + +// -------------------------------------------------- BLOWFISH -------------------------------------------------- // + +/****************************** MACROS ******************************/ +#define BLOWFISH_BLOCK_SIZE 8 // Blowfish operates on 8 bytes at a time + +/**************************** DATA TYPES ****************************/ + +typedef struct { + WORD p[18]; + WORD s[4][256]; +} _BLOWFISH_KEY; + +/*********************** FUNCTION DECLARATIONS **********************/ +void blowfish_key_setup(const BYTE user_key[], _BLOWFISH_KEY *keystruct, size_t len); +void blowfish_encrypt(const BYTE in[], BYTE out[], const _BLOWFISH_KEY *keystruct); +void blowfish_decrypt(const BYTE in[], BYTE out[], const _BLOWFISH_KEY *keystruct); + +// -------------------------------------------------- ROT-13 -------------------------------------------------- // + +/*********************** FUNCTION DECLARATIONS **********************/ +// Performs IN PLACE rotation of the input. Assumes input is NULL terminated. +// Preserves each charcter's case. Ignores non alphabetic characters. +void rot13(char str[]); diff --git a/common/http/llhttp.h b/common/http/llhttp.h index 63ad1af..46a7213 100644 --- a/common/http/llhttp.h +++ b/common/http/llhttp.h @@ -3,8 +3,8 @@ #define INCLUDE_LLHTTP_H_ #define LLHTTP_VERSION_MAJOR 9 -#define LLHTTP_VERSION_MINOR 2 -#define LLHTTP_VERSION_PATCH 1 +#define LLHTTP_VERSION_MINOR 1 +#define LLHTTP_VERSION_PATCH 3 #ifndef INCLUDE_LLHTTP_ITSELF_H_ #define INCLUDE_LLHTTP_ITSELF_H_ @@ -181,8 +181,7 @@ enum llhttp_method { HTTP_SET_PARAMETER = 42, HTTP_REDIRECT = 43, HTTP_RECORD = 44, - HTTP_FLUSH = 45, - HTTP_QUERY = 46 + HTTP_FLUSH = 45 }; typedef enum llhttp_method llhttp_method_t; @@ -363,7 +362,6 @@ typedef enum llhttp_status llhttp_status_t; XX(31, LINK, LINK) \ XX(32, UNLINK, UNLINK) \ XX(33, SOURCE, SOURCE) \ - XX(46, QUERY, QUERY) \ #define RTSP_METHOD_MAP(XX) \ @@ -430,7 +428,6 @@ typedef enum llhttp_status llhttp_status_t; XX(43, REDIRECT, REDIRECT) \ XX(44, RECORD, RECORD) \ XX(45, FLUSH, FLUSH) \ - XX(46, QUERY, QUERY) \ #define HTTP_STATUS_MAP(XX) \ @@ -550,8 +547,6 @@ extern "C" { #if defined(__wasm__) #define LLHTTP_EXPORT __attribute__((visibility("default"))) -//#elif defined(_WIN32) -//#define LLHTTP_EXPORT __declspec(dllexport) #else #define LLHTTP_EXPORT #endif diff --git a/common/http/llhttp_internal.c b/common/http/llhttp_internal.c index 999ec50..d789ac6 100644 --- a/common/http/llhttp_internal.c +++ b/common/http/llhttp_internal.c @@ -170,57 +170,54 @@ static const unsigned char llparse_blob42[] = { 'G', 'E' }; static const unsigned char llparse_blob43[] = { - 'U', 'E', 'R', 'Y' + 'I', 'N', 'D' }; static const unsigned char llparse_blob44[] = { - 'I', 'N', 'D' -}; -static const unsigned char llparse_blob45[] = { 'O', 'R', 'D' }; -static const unsigned char llparse_blob46[] = { +static const unsigned char llparse_blob45[] = { 'I', 'R', 'E', 'C', 'T' }; -static const unsigned char llparse_blob47[] = { +static const unsigned char llparse_blob46[] = { 'O', 'R', 'T' }; -static const unsigned char llparse_blob48[] = { +static const unsigned char llparse_blob47[] = { 'R', 'C', 'H' }; -static const unsigned char llparse_blob49[] = { +static const unsigned char llparse_blob48[] = { 'P', 'A', 'R', 'A', 'M', 'E', 'T', 'E', 'R' }; -static const unsigned char llparse_blob50[] = { +static const unsigned char llparse_blob49[] = { 'U', 'R', 'C', 'E' }; -static const unsigned char llparse_blob51[] = { +static const unsigned char llparse_blob50[] = { 'B', 'S', 'C', 'R', 'I', 'B', 'E' }; -static const unsigned char llparse_blob52[] = { +static const unsigned char llparse_blob51[] = { 'A', 'R', 'D', 'O', 'W', 'N' }; -static const unsigned char llparse_blob53[] = { +static const unsigned char llparse_blob52[] = { 'A', 'C', 'E' }; -static const unsigned char llparse_blob54[] = { +static const unsigned char llparse_blob53[] = { 'I', 'N', 'D' }; -static const unsigned char llparse_blob55[] = { +static const unsigned char llparse_blob54[] = { 'N', 'K' }; -static const unsigned char llparse_blob56[] = { +static const unsigned char llparse_blob55[] = { 'C', 'K' }; -static const unsigned char llparse_blob57[] = { +static const unsigned char llparse_blob56[] = { 'U', 'B', 'S', 'C', 'R', 'I', 'B', 'E' }; -static const unsigned char llparse_blob58[] = { +static const unsigned char llparse_blob57[] = { 'H', 'T', 'T', 'P', '/' }; -static const unsigned char llparse_blob59[] = { +static const unsigned char llparse_blob58[] = { 'A', 'D' }; -static const unsigned char llparse_blob60[] = { +static const unsigned char llparse_blob59[] = { 'T', 'P', '/' }; @@ -387,7 +384,7 @@ enum llparse_state_e { s_n_llhttp__internal__n_header_value_almost_done, s_n_llhttp__internal__n_invoke_test_lenient_flags_17, s_n_llhttp__internal__n_header_value_lenient, - s_n_llhttp__internal__n_error_54, + s_n_llhttp__internal__n_error_52, s_n_llhttp__internal__n_header_value_otherwise, s_n_llhttp__internal__n_header_value_connection_token, s_n_llhttp__internal__n_header_value_connection_ws, @@ -395,12 +392,12 @@ enum llparse_state_e { s_n_llhttp__internal__n_header_value_connection_2, s_n_llhttp__internal__n_header_value_connection_3, s_n_llhttp__internal__n_header_value_connection, - s_n_llhttp__internal__n_error_56, - s_n_llhttp__internal__n_error_57, + s_n_llhttp__internal__n_error_54, + s_n_llhttp__internal__n_error_55, s_n_llhttp__internal__n_header_value_content_length_ws, s_n_llhttp__internal__n_header_value_content_length, - s_n_llhttp__internal__n_error_59, - s_n_llhttp__internal__n_error_58, + s_n_llhttp__internal__n_error_57, + s_n_llhttp__internal__n_error_56, s_n_llhttp__internal__n_header_value_te_token_ows, s_n_llhttp__internal__n_header_value, s_n_llhttp__internal__n_header_value_te_token, @@ -433,12 +430,12 @@ enum llparse_state_e { s_n_llhttp__internal__n_req_http_complete, s_n_llhttp__internal__n_invoke_load_method_1, s_n_llhttp__internal__n_invoke_llhttp__on_version_complete, - s_n_llhttp__internal__n_error_66, - s_n_llhttp__internal__n_error_73, + s_n_llhttp__internal__n_error_64, + s_n_llhttp__internal__n_error_71, s_n_llhttp__internal__n_req_http_minor, - s_n_llhttp__internal__n_error_74, + s_n_llhttp__internal__n_error_72, s_n_llhttp__internal__n_req_http_dot, - s_n_llhttp__internal__n_error_75, + s_n_llhttp__internal__n_error_73, s_n_llhttp__internal__n_req_http_major, s_n_llhttp__internal__n_span_start_llhttp__on_version, s_n_llhttp__internal__n_req_http_start_1, @@ -514,35 +511,34 @@ enum llparse_state_e { s_n_llhttp__internal__n_after_start_req_45, s_n_llhttp__internal__n_after_start_req_44, s_n_llhttp__internal__n_after_start_req_33, - s_n_llhttp__internal__n_after_start_req_46, + s_n_llhttp__internal__n_after_start_req_48, s_n_llhttp__internal__n_after_start_req_49, s_n_llhttp__internal__n_after_start_req_50, s_n_llhttp__internal__n_after_start_req_51, - s_n_llhttp__internal__n_after_start_req_52, - s_n_llhttp__internal__n_after_start_req_48, s_n_llhttp__internal__n_after_start_req_47, - s_n_llhttp__internal__n_after_start_req_55, - s_n_llhttp__internal__n_after_start_req_57, - s_n_llhttp__internal__n_after_start_req_58, - s_n_llhttp__internal__n_after_start_req_56, + s_n_llhttp__internal__n_after_start_req_46, s_n_llhttp__internal__n_after_start_req_54, - s_n_llhttp__internal__n_after_start_req_59, - s_n_llhttp__internal__n_after_start_req_60, + s_n_llhttp__internal__n_after_start_req_56, + s_n_llhttp__internal__n_after_start_req_57, + s_n_llhttp__internal__n_after_start_req_55, s_n_llhttp__internal__n_after_start_req_53, - s_n_llhttp__internal__n_after_start_req_62, - s_n_llhttp__internal__n_after_start_req_63, + s_n_llhttp__internal__n_after_start_req_58, + s_n_llhttp__internal__n_after_start_req_59, + s_n_llhttp__internal__n_after_start_req_52, s_n_llhttp__internal__n_after_start_req_61, - s_n_llhttp__internal__n_after_start_req_66, - s_n_llhttp__internal__n_after_start_req_68, - s_n_llhttp__internal__n_after_start_req_69, - s_n_llhttp__internal__n_after_start_req_67, - s_n_llhttp__internal__n_after_start_req_70, + s_n_llhttp__internal__n_after_start_req_62, + s_n_llhttp__internal__n_after_start_req_60, s_n_llhttp__internal__n_after_start_req_65, + s_n_llhttp__internal__n_after_start_req_67, + s_n_llhttp__internal__n_after_start_req_68, + s_n_llhttp__internal__n_after_start_req_66, + s_n_llhttp__internal__n_after_start_req_69, s_n_llhttp__internal__n_after_start_req_64, + s_n_llhttp__internal__n_after_start_req_63, s_n_llhttp__internal__n_after_start_req, s_n_llhttp__internal__n_span_start_llhttp__on_method_1, s_n_llhttp__internal__n_res_line_almost_done, - s_n_llhttp__internal__n_invoke_test_lenient_flags_30, + s_n_llhttp__internal__n_invoke_test_lenient_flags_29, s_n_llhttp__internal__n_res_status, s_n_llhttp__internal__n_span_start_llhttp__on_status, s_n_llhttp__internal__n_res_status_code_otherwise, @@ -551,12 +547,12 @@ enum llparse_state_e { s_n_llhttp__internal__n_res_status_code_digit_1, s_n_llhttp__internal__n_res_after_version, s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1, - s_n_llhttp__internal__n_error_89, - s_n_llhttp__internal__n_error_103, + s_n_llhttp__internal__n_error_87, + s_n_llhttp__internal__n_error_101, s_n_llhttp__internal__n_res_http_minor, - s_n_llhttp__internal__n_error_104, + s_n_llhttp__internal__n_error_102, s_n_llhttp__internal__n_res_http_dot, - s_n_llhttp__internal__n_error_105, + s_n_llhttp__internal__n_error_103, s_n_llhttp__internal__n_res_http_major, s_n_llhttp__internal__n_span_start_llhttp__on_version_1, s_n_llhttp__internal__n_start_res, @@ -895,7 +891,7 @@ int llhttp__internal__c_test_flags_4( return (state->flags & 512) == 512; } -int llhttp__internal__c_test_lenient_flags_22( +int llhttp__internal__c_test_lenient_flags_21( llhttp__internal_t* state, const unsigned char* p, const unsigned char* endp) { @@ -1026,7 +1022,7 @@ int llhttp__internal__c_test_flags_3( return (state->flags & 8) == 8; } -int llhttp__internal__c_test_lenient_flags_20( +int llhttp__internal__c_test_lenient_flags_19( llhttp__internal_t* state, const unsigned char* p, const unsigned char* endp) { @@ -1090,7 +1086,7 @@ int llhttp__internal__c_store_http_minor( return 0; } -int llhttp__internal__c_test_lenient_flags_24( +int llhttp__internal__c_test_lenient_flags_23( llhttp__internal_t* state, const unsigned char* p, const unsigned char* endp) { @@ -2145,7 +2141,7 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_18; default: - goto s_n_llhttp__internal__n_error_48; + goto s_n_llhttp__internal__n_error_47; } /* UNREACHABLE */; abort(); @@ -2206,10 +2202,10 @@ static llparse_state_t llhttp__internal__run( } switch (*p) { case 9: { - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_18; + goto s_n_llhttp__internal__n_invoke_load_header_state_4; } case ' ': { - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_18; + goto s_n_llhttp__internal__n_invoke_load_header_state_4; } default: { goto s_n_llhttp__internal__n_invoke_load_header_state_5; @@ -2229,7 +2225,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_header_value_lws; } default: { - goto s_n_llhttp__internal__n_error_53; + goto s_n_llhttp__internal__n_error_51; } } /* UNREACHABLE */; @@ -2241,7 +2237,7 @@ static llparse_state_t llhttp__internal__run( case 1: goto s_n_llhttp__internal__n_header_value_almost_done; default: - goto s_n_llhttp__internal__n_error_51; + goto s_n_llhttp__internal__n_error_50; } /* UNREACHABLE */; abort(); @@ -2266,8 +2262,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_54: - s_n_llhttp__internal__n_error_54: { + case s_n_llhttp__internal__n_error_52: + s_n_llhttp__internal__n_error_52: { state->error = 0xa; state->reason = "Invalid header value char"; state->error_pos = (const char*) p; @@ -2289,7 +2285,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_2; } default: { - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_19; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_18; } } /* UNREACHABLE */; @@ -2466,8 +2462,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_56: - s_n_llhttp__internal__n_error_56: { + case s_n_llhttp__internal__n_error_54: + s_n_llhttp__internal__n_error_54: { state->error = 0xb; state->reason = "Content-Length overflow"; state->error_pos = (const char*) p; @@ -2476,8 +2472,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_57: - s_n_llhttp__internal__n_error_57: { + case s_n_llhttp__internal__n_error_55: + s_n_llhttp__internal__n_error_55: { state->error = 0xb; state->reason = "Invalid character in Content-Length"; state->error_pos = (const char*) p; @@ -2572,8 +2568,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_59: - s_n_llhttp__internal__n_error_59: { + case s_n_llhttp__internal__n_error_57: + s_n_llhttp__internal__n_error_57: { state->error = 0xf; state->reason = "Invalid `Transfer-Encoding` header value"; state->error_pos = (const char*) p; @@ -2582,8 +2578,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_58: - s_n_llhttp__internal__n_error_58: { + case s_n_llhttp__internal__n_error_56: + s_n_llhttp__internal__n_error_56: { state->error = 0xf; state->reason = "Invalid `Transfer-Encoding` header value"; state->error_pos = (const char*) p; @@ -2822,7 +2818,7 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_19; default: - goto s_n_llhttp__internal__n_error_45; + goto s_n_llhttp__internal__n_error_44; } /* UNREACHABLE */; abort(); @@ -2837,7 +2833,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2; } default: { - goto s_n_llhttp__internal__n_error_62; + goto s_n_llhttp__internal__n_error_60; } } /* UNREACHABLE */; @@ -3157,9 +3153,6 @@ static llparse_state_t llhttp__internal__run( p++; goto s_n_llhttp__internal__n_headers_almost_done; } - case ':': { - goto s_n_llhttp__internal__n_error_44; - } default: { goto s_n_llhttp__internal__n_span_start_llhttp__on_header_field; } @@ -3238,7 +3231,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_to_http_09; } default: { - goto s_n_llhttp__internal__n_error_63; + goto s_n_llhttp__internal__n_error_61; } } /* UNREACHABLE */; @@ -3263,7 +3256,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_skip_lf_to_http09_1; } default: { - goto s_n_llhttp__internal__n_error_63; + goto s_n_llhttp__internal__n_error_61; } } /* UNREACHABLE */; @@ -3281,13 +3274,13 @@ static llparse_state_t llhttp__internal__run( switch (match_seq.status) { case kMatchComplete: { p++; - goto s_n_llhttp__internal__n_error_71; + goto s_n_llhttp__internal__n_error_69; } case kMatchPause: { return s_n_llhttp__internal__n_req_pri_upgrade; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_72; + goto s_n_llhttp__internal__n_error_70; } } /* UNREACHABLE */; @@ -3304,7 +3297,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_headers_start; } default: { - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_26; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_25; } } /* UNREACHABLE */; @@ -3318,14 +3311,14 @@ static llparse_state_t llhttp__internal__run( switch (*p) { case 10: { p++; - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_25; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_24; } case 13: { p++; goto s_n_llhttp__internal__n_req_http_complete_crlf; } default: { - goto s_n_llhttp__internal__n_error_70; + goto s_n_llhttp__internal__n_error_68; } } /* UNREACHABLE */; @@ -3350,13 +3343,13 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_21; default: - goto s_n_llhttp__internal__n_error_67; + goto s_n_llhttp__internal__n_error_65; } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_66: - s_n_llhttp__internal__n_error_66: { + case s_n_llhttp__internal__n_error_64: + s_n_llhttp__internal__n_error_64: { state->error = 0x9; state->reason = "Invalid HTTP version"; state->error_pos = (const char*) p; @@ -3365,8 +3358,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_73: - s_n_llhttp__internal__n_error_73: { + case s_n_llhttp__internal__n_error_71: + s_n_llhttp__internal__n_error_71: { state->error = 0x9; state->reason = "Invalid minor version"; state->error_pos = (const char*) p; @@ -3438,8 +3431,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_74: - s_n_llhttp__internal__n_error_74: { + case s_n_llhttp__internal__n_error_72: + s_n_llhttp__internal__n_error_72: { state->error = 0x9; state->reason = "Expected dot"; state->error_pos = (const char*) p; @@ -3465,8 +3458,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_75: - s_n_llhttp__internal__n_error_75: { + case s_n_llhttp__internal__n_error_73: + s_n_llhttp__internal__n_error_73: { state->error = 0x9; state->reason = "Invalid major version"; state->error_pos = (const char*) p; @@ -3567,7 +3560,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_req_http_start_1; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_78; + goto s_n_llhttp__internal__n_error_76; } } /* UNREACHABLE */; @@ -3591,7 +3584,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_req_http_start_2; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_78; + goto s_n_llhttp__internal__n_error_76; } } /* UNREACHABLE */; @@ -3615,7 +3608,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_req_http_start_3; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_78; + goto s_n_llhttp__internal__n_error_76; } } /* UNREACHABLE */; @@ -3644,7 +3637,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_req_http_start_3; } default: { - goto s_n_llhttp__internal__n_error_78; + goto s_n_llhttp__internal__n_error_76; } } /* UNREACHABLE */; @@ -3735,7 +3728,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_fragment; } default: { - goto s_n_llhttp__internal__n_error_79; + goto s_n_llhttp__internal__n_error_77; } } /* UNREACHABLE */; @@ -3796,7 +3789,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_span_end_stub_query_3; } default: { - goto s_n_llhttp__internal__n_error_80; + goto s_n_llhttp__internal__n_error_78; } } /* UNREACHABLE */; @@ -3834,7 +3827,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_query; } default: { - goto s_n_llhttp__internal__n_error_81; + goto s_n_llhttp__internal__n_error_79; } } /* UNREACHABLE */; @@ -3959,10 +3952,10 @@ static llparse_state_t llhttp__internal__run( } case 8: { p++; - goto s_n_llhttp__internal__n_error_82; + goto s_n_llhttp__internal__n_error_80; } default: { - goto s_n_llhttp__internal__n_error_83; + goto s_n_llhttp__internal__n_error_81; } } /* UNREACHABLE */; @@ -4021,7 +4014,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_server_with_at; } default: { - goto s_n_llhttp__internal__n_error_84; + goto s_n_llhttp__internal__n_error_82; } } /* UNREACHABLE */; @@ -4038,7 +4031,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_server; } default: { - goto s_n_llhttp__internal__n_error_85; + goto s_n_llhttp__internal__n_error_83; } } /* UNREACHABLE */; @@ -4075,7 +4068,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_schema_delim_1; } default: { - goto s_n_llhttp__internal__n_error_85; + goto s_n_llhttp__internal__n_error_83; } } /* UNREACHABLE */; @@ -4127,7 +4120,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_schema; } default: { - goto s_n_llhttp__internal__n_error_86; + goto s_n_llhttp__internal__n_error_84; } } /* UNREACHABLE */; @@ -4168,7 +4161,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_url_schema; } default: { - goto s_n_llhttp__internal__n_error_87; + goto s_n_llhttp__internal__n_error_85; } } /* UNREACHABLE */; @@ -4266,7 +4259,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_req_spaces_before_url; } default: { - goto s_n_llhttp__internal__n_error_88; + goto s_n_llhttp__internal__n_error_86; } } /* UNREACHABLE */; @@ -4280,7 +4273,7 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_26; default: - goto s_n_llhttp__internal__n_error_107; + goto s_n_llhttp__internal__n_error_105; } /* UNREACHABLE */; abort(); @@ -4297,7 +4290,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4322,7 +4315,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_3; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4343,7 +4336,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_3; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4368,7 +4361,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_4; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4393,7 +4386,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_6; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4418,7 +4411,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_8; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4436,7 +4429,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4457,7 +4450,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_9; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4478,7 +4471,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_7; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4503,7 +4496,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_12; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4528,7 +4521,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_13; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4549,7 +4542,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_13; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4566,7 +4559,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_11; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4591,7 +4584,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_14; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4616,7 +4609,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_17; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4658,7 +4651,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_15; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4683,7 +4676,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_18; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4708,7 +4701,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_20; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4733,7 +4726,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_21; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4754,7 +4747,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_21; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4779,7 +4772,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_23; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4804,7 +4797,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_24; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4829,7 +4822,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_26; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4854,7 +4847,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_28; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4872,7 +4865,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4893,7 +4886,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_29; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4914,7 +4907,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_27; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4939,7 +4932,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_30; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4968,7 +4961,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_30; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -4993,7 +4986,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_31; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5018,7 +5011,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_32; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5043,7 +5036,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_35; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5068,7 +5061,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_36; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5089,7 +5082,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_36; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5114,7 +5107,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_37; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5139,7 +5132,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_38; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5164,7 +5157,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_42; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5189,7 +5182,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_43; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5210,7 +5203,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_43; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5227,7 +5220,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_41; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5249,7 +5242,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_40; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5274,7 +5267,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_45; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5296,7 +5289,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5329,32 +5322,32 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_after_start_req_44; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_46: - s_n_llhttp__internal__n_after_start_req_46: { + case s_n_llhttp__internal__n_after_start_req_48: + s_n_llhttp__internal__n_after_start_req_48: { llparse_match_t match_seq; if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_46; + return s_n_llhttp__internal__n_after_start_req_48; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob43, 4); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob43, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { p++; - match = 46; + match = 17; goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_46; + return s_n_llhttp__internal__n_after_start_req_48; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5372,14 +5365,14 @@ static llparse_state_t llhttp__internal__run( switch (match_seq.status) { case kMatchComplete: { p++; - match = 17; + match = 44; goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { return s_n_llhttp__internal__n_after_start_req_49; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5392,19 +5385,19 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_50; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob45, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob45, 5); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { p++; - match = 44; + match = 43; goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { return s_n_llhttp__internal__n_after_start_req_50; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5417,32 +5410,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_51; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob46, 5); - p = match_seq.current; - switch (match_seq.status) { - case kMatchComplete: { - p++; - match = 43; - goto s_n_llhttp__internal__n_invoke_store_method_1; - } - case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_51; - } - case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_52: - s_n_llhttp__internal__n_after_start_req_52: { - llparse_match_t match_seq; - - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_52; - } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob47, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob46, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5451,39 +5419,10 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_52; + return s_n_llhttp__internal__n_after_start_req_51; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_48: - s_n_llhttp__internal__n_after_start_req_48: { - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_48; - } - switch (*p) { - case 'B': { - p++; - goto s_n_llhttp__internal__n_after_start_req_49; - } - case 'C': { - p++; - goto s_n_llhttp__internal__n_after_start_req_50; - } - case 'D': { - p++; - goto s_n_llhttp__internal__n_after_start_req_51; - } - case 'P': { - p++; - goto s_n_llhttp__internal__n_after_start_req_52; - } - default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5495,25 +5434,54 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_47; } switch (*p) { - case 'E': { + case 'B': { p++; goto s_n_llhttp__internal__n_after_start_req_48; } + case 'C': { + p++; + goto s_n_llhttp__internal__n_after_start_req_49; + } + case 'D': { + p++; + goto s_n_llhttp__internal__n_after_start_req_50; + } + case 'P': { + p++; + goto s_n_llhttp__internal__n_after_start_req_51; + } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_55: - s_n_llhttp__internal__n_after_start_req_55: { + case s_n_llhttp__internal__n_after_start_req_46: + s_n_llhttp__internal__n_after_start_req_46: { + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_46; + } + switch (*p) { + case 'E': { + p++; + goto s_n_llhttp__internal__n_after_start_req_47; + } + default: { + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_54: + s_n_llhttp__internal__n_after_start_req_54: { llparse_match_t match_seq; if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_55; + return s_n_llhttp__internal__n_after_start_req_54; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob48, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob47, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5522,19 +5490,19 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_55; + return s_n_llhttp__internal__n_after_start_req_54; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_57: - s_n_llhttp__internal__n_after_start_req_57: { + case s_n_llhttp__internal__n_after_start_req_56: + s_n_llhttp__internal__n_after_start_req_56: { if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_57; + return s_n_llhttp__internal__n_after_start_req_56; } switch (*p) { case 'P': { @@ -5543,7 +5511,74 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_57: + s_n_llhttp__internal__n_after_start_req_57: { + llparse_match_t match_seq; + + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_57; + } + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob48, 9); + p = match_seq.current; + switch (match_seq.status) { + case kMatchComplete: { + p++; + match = 42; + goto s_n_llhttp__internal__n_invoke_store_method_1; + } + case kMatchPause: { + return s_n_llhttp__internal__n_after_start_req_57; + } + case kMatchMismatch: { + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_55: + s_n_llhttp__internal__n_after_start_req_55: { + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_55; + } + switch (*p) { + case 'U': { + p++; + goto s_n_llhttp__internal__n_after_start_req_56; + } + case '_': { + p++; + goto s_n_llhttp__internal__n_after_start_req_57; + } + default: { + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_53: + s_n_llhttp__internal__n_after_start_req_53: { + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_53; + } + switch (*p) { + case 'A': { + p++; + goto s_n_llhttp__internal__n_after_start_req_54; + } + case 'T': { + p++; + goto s_n_llhttp__internal__n_after_start_req_55; + } + default: { + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5556,61 +5591,19 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_58; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob49, 9); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob49, 4); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { p++; - match = 42; + match = 33; goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { return s_n_llhttp__internal__n_after_start_req_58; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_56: - s_n_llhttp__internal__n_after_start_req_56: { - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_56; - } - switch (*p) { - case 'U': { - p++; - goto s_n_llhttp__internal__n_after_start_req_57; - } - case '_': { - p++; - goto s_n_llhttp__internal__n_after_start_req_58; - } - default: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_54: - s_n_llhttp__internal__n_after_start_req_54: { - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_54; - } - switch (*p) { - case 'A': { - p++; - goto s_n_llhttp__internal__n_after_start_req_55; - } - case 'T': { - p++; - goto s_n_llhttp__internal__n_after_start_req_56; - } - default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5623,32 +5616,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_59; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob50, 4); - p = match_seq.current; - switch (match_seq.status) { - case kMatchComplete: { - p++; - match = 33; - goto s_n_llhttp__internal__n_invoke_store_method_1; - } - case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_59; - } - case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_60: - s_n_llhttp__internal__n_after_start_req_60: { - llparse_match_t match_seq; - - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_60; - } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob51, 7); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob50, 7); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5657,35 +5625,60 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_60; + return s_n_llhttp__internal__n_after_start_req_59; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_53: - s_n_llhttp__internal__n_after_start_req_53: { + case s_n_llhttp__internal__n_after_start_req_52: + s_n_llhttp__internal__n_after_start_req_52: { if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_53; + return s_n_llhttp__internal__n_after_start_req_52; } switch (*p) { case 'E': { p++; - goto s_n_llhttp__internal__n_after_start_req_54; + goto s_n_llhttp__internal__n_after_start_req_53; } case 'O': { p++; - goto s_n_llhttp__internal__n_after_start_req_59; + goto s_n_llhttp__internal__n_after_start_req_58; } case 'U': { p++; - goto s_n_llhttp__internal__n_after_start_req_60; + goto s_n_llhttp__internal__n_after_start_req_59; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_61: + s_n_llhttp__internal__n_after_start_req_61: { + llparse_match_t match_seq; + + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_61; + } + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob51, 6); + p = match_seq.current; + switch (match_seq.status) { + case kMatchComplete: { + p++; + match = 40; + goto s_n_llhttp__internal__n_invoke_store_method_1; + } + case kMatchPause: { + return s_n_llhttp__internal__n_after_start_req_61; + } + case kMatchMismatch: { + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5698,32 +5691,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_62; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob52, 6); - p = match_seq.current; - switch (match_seq.status) { - case kMatchComplete: { - p++; - match = 40; - goto s_n_llhttp__internal__n_invoke_store_method_1; - } - case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_62; - } - case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_63: - s_n_llhttp__internal__n_after_start_req_63: { - llparse_match_t match_seq; - - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_63; - } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob53, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob52, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5732,44 +5700,44 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_63; + return s_n_llhttp__internal__n_after_start_req_62; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_61: - s_n_llhttp__internal__n_after_start_req_61: { + case s_n_llhttp__internal__n_after_start_req_60: + s_n_llhttp__internal__n_after_start_req_60: { if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_61; + return s_n_llhttp__internal__n_after_start_req_60; } switch (*p) { case 'E': { p++; - goto s_n_llhttp__internal__n_after_start_req_62; + goto s_n_llhttp__internal__n_after_start_req_61; } case 'R': { p++; - goto s_n_llhttp__internal__n_after_start_req_63; + goto s_n_llhttp__internal__n_after_start_req_62; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_after_start_req_66: - s_n_llhttp__internal__n_after_start_req_66: { + case s_n_llhttp__internal__n_after_start_req_65: + s_n_llhttp__internal__n_after_start_req_65: { llparse_match_t match_seq; if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_66; + return s_n_llhttp__internal__n_after_start_req_65; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob54, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob53, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5778,10 +5746,35 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_66; + return s_n_llhttp__internal__n_after_start_req_65; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_67: + s_n_llhttp__internal__n_after_start_req_67: { + llparse_match_t match_seq; + + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_67; + } + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob54, 2); + p = match_seq.current; + switch (match_seq.status) { + case kMatchComplete: { + p++; + match = 32; + goto s_n_llhttp__internal__n_invoke_store_method_1; + } + case kMatchPause: { + return s_n_llhttp__internal__n_after_start_req_67; + } + case kMatchMismatch: { + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5799,14 +5792,35 @@ static llparse_state_t llhttp__internal__run( switch (match_seq.status) { case kMatchComplete: { p++; - match = 32; + match = 15; goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { return s_n_llhttp__internal__n_after_start_req_68; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_66: + s_n_llhttp__internal__n_after_start_req_66: { + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_66; + } + switch (*p) { + case 'I': { + p++; + goto s_n_llhttp__internal__n_after_start_req_67; + } + case 'O': { + p++; + goto s_n_llhttp__internal__n_after_start_req_68; + } + default: { + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5819,53 +5833,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_after_start_req_69; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob56, 2); - p = match_seq.current; - switch (match_seq.status) { - case kMatchComplete: { - p++; - match = 15; - goto s_n_llhttp__internal__n_invoke_store_method_1; - } - case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_69; - } - case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_67: - s_n_llhttp__internal__n_after_start_req_67: { - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_67; - } - switch (*p) { - case 'I': { - p++; - goto s_n_llhttp__internal__n_after_start_req_68; - } - case 'O': { - p++; - goto s_n_llhttp__internal__n_after_start_req_69; - } - default: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_70: - s_n_llhttp__internal__n_after_start_req_70: { - llparse_match_t match_seq; - - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_70; - } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob57, 8); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob56, 8); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -5874,35 +5842,10 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_store_method_1; } case kMatchPause: { - return s_n_llhttp__internal__n_after_start_req_70; + return s_n_llhttp__internal__n_after_start_req_69; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_108; - } - } - /* UNREACHABLE */; - abort(); - } - case s_n_llhttp__internal__n_after_start_req_65: - s_n_llhttp__internal__n_after_start_req_65: { - if (p == endp) { - return s_n_llhttp__internal__n_after_start_req_65; - } - switch (*p) { - case 'B': { - p++; - goto s_n_llhttp__internal__n_after_start_req_66; - } - case 'L': { - p++; - goto s_n_llhttp__internal__n_after_start_req_67; - } - case 'S': { - p++; - goto s_n_llhttp__internal__n_after_start_req_70; - } - default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5914,12 +5857,37 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_after_start_req_64; } switch (*p) { - case 'N': { + case 'B': { p++; goto s_n_llhttp__internal__n_after_start_req_65; } + case 'L': { + p++; + goto s_n_llhttp__internal__n_after_start_req_66; + } + case 'S': { + p++; + goto s_n_llhttp__internal__n_after_start_req_69; + } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; + } + } + /* UNREACHABLE */; + abort(); + } + case s_n_llhttp__internal__n_after_start_req_63: + s_n_llhttp__internal__n_after_start_req_63: { + if (p == endp) { + return s_n_llhttp__internal__n_after_start_req_63; + } + switch (*p) { + case 'N': { + p++; + goto s_n_llhttp__internal__n_after_start_req_64; + } + default: { + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -5979,28 +5947,24 @@ static llparse_state_t llhttp__internal__run( p++; goto s_n_llhttp__internal__n_after_start_req_33; } - case 'Q': { + case 'R': { p++; goto s_n_llhttp__internal__n_after_start_req_46; } - case 'R': { - p++; - goto s_n_llhttp__internal__n_after_start_req_47; - } case 'S': { p++; - goto s_n_llhttp__internal__n_after_start_req_53; + goto s_n_llhttp__internal__n_after_start_req_52; } case 'T': { p++; - goto s_n_llhttp__internal__n_after_start_req_61; + goto s_n_llhttp__internal__n_after_start_req_60; } case 'U': { p++; - goto s_n_llhttp__internal__n_after_start_req_64; + goto s_n_llhttp__internal__n_after_start_req_63; } default: { - goto s_n_llhttp__internal__n_error_108; + goto s_n_llhttp__internal__n_error_106; } } /* UNREACHABLE */; @@ -6032,19 +5996,19 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete; } default: { - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_29; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_28; } } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_invoke_test_lenient_flags_30: - s_n_llhttp__internal__n_invoke_test_lenient_flags_30: { + case s_n_llhttp__internal__n_invoke_test_lenient_flags_29: + s_n_llhttp__internal__n_invoke_test_lenient_flags_29: { switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete; default: - goto s_n_llhttp__internal__n_error_94; + goto s_n_llhttp__internal__n_error_92; } /* UNREACHABLE */; abort(); @@ -6088,7 +6052,7 @@ static llparse_state_t llhttp__internal__run( switch (*p) { case 10: { p++; - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_28; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_27; } case 13: { p++; @@ -6099,7 +6063,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_span_start_llhttp__on_status; } default: { - goto s_n_llhttp__internal__n_error_95; + goto s_n_llhttp__internal__n_error_93; } } /* UNREACHABLE */; @@ -6162,7 +6126,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2; } default: { - goto s_n_llhttp__internal__n_error_97; + goto s_n_llhttp__internal__n_error_95; } } /* UNREACHABLE */; @@ -6225,7 +6189,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1; } default: { - goto s_n_llhttp__internal__n_error_99; + goto s_n_llhttp__internal__n_error_97; } } /* UNREACHABLE */; @@ -6288,7 +6252,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_mul_add_status_code; } default: { - goto s_n_llhttp__internal__n_error_101; + goto s_n_llhttp__internal__n_error_99; } } /* UNREACHABLE */; @@ -6305,7 +6269,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_invoke_update_status_code; } default: { - goto s_n_llhttp__internal__n_error_102; + goto s_n_llhttp__internal__n_error_100; } } /* UNREACHABLE */; @@ -6319,13 +6283,13 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_25; default: - goto s_n_llhttp__internal__n_error_90; + goto s_n_llhttp__internal__n_error_88; } /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_89: - s_n_llhttp__internal__n_error_89: { + case s_n_llhttp__internal__n_error_87: + s_n_llhttp__internal__n_error_87: { state->error = 0x9; state->reason = "Invalid HTTP version"; state->error_pos = (const char*) p; @@ -6334,8 +6298,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_103: - s_n_llhttp__internal__n_error_103: { + case s_n_llhttp__internal__n_error_101: + s_n_llhttp__internal__n_error_101: { state->error = 0x9; state->reason = "Invalid minor version"; state->error_pos = (const char*) p; @@ -6407,8 +6371,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_104: - s_n_llhttp__internal__n_error_104: { + case s_n_llhttp__internal__n_error_102: + s_n_llhttp__internal__n_error_102: { state->error = 0x9; state->reason = "Expected dot"; state->error_pos = (const char*) p; @@ -6434,8 +6398,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - case s_n_llhttp__internal__n_error_105: - s_n_llhttp__internal__n_error_105: { + case s_n_llhttp__internal__n_error_103: + s_n_llhttp__internal__n_error_103: { state->error = 0x9; state->reason = "Invalid major version"; state->error_pos = (const char*) p; @@ -6525,7 +6489,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_start_res; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob58, 5); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob57, 5); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -6536,7 +6500,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_start_res; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_109; + goto s_n_llhttp__internal__n_error_107; } } /* UNREACHABLE */; @@ -6562,7 +6526,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_req_or_res_method_2; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob59, 2); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob58, 2); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -6574,7 +6538,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_req_or_res_method_2; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_106; + goto s_n_llhttp__internal__n_error_104; } } /* UNREACHABLE */; @@ -6596,7 +6560,7 @@ static llparse_state_t llhttp__internal__run( if (p == endp) { return s_n_llhttp__internal__n_req_or_res_method_3; } - match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob60, 3); + match_seq = llparse__match_sequence_id(state, p, endp, llparse_blob59, 3); p = match_seq.current; switch (match_seq.status) { case kMatchComplete: { @@ -6607,7 +6571,7 @@ static llparse_state_t llhttp__internal__run( return s_n_llhttp__internal__n_req_or_res_method_3; } case kMatchMismatch: { - goto s_n_llhttp__internal__n_error_106; + goto s_n_llhttp__internal__n_error_104; } } /* UNREACHABLE */; @@ -6628,7 +6592,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_req_or_res_method_3; } default: { - goto s_n_llhttp__internal__n_error_106; + goto s_n_llhttp__internal__n_error_104; } } /* UNREACHABLE */; @@ -6645,7 +6609,7 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_req_or_res_method_1; } default: { - goto s_n_llhttp__internal__n_error_106; + goto s_n_llhttp__internal__n_error_104; } } /* UNREACHABLE */; @@ -7798,15 +7762,6 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_44: { - state->error = 0xa; - state->reason = "Invalid header token"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } s_n_llhttp__internal__n_span_end_llhttp__on_header_field: { const unsigned char* start; int err; @@ -7835,7 +7790,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_60: { + s_n_llhttp__internal__n_error_58: { state->error = 0xb; state->reason = "Content-Length can't be present with Transfer-Encoding"; state->error_pos = (const char*) p; @@ -7844,7 +7799,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_47: { + s_n_llhttp__internal__n_error_46: { state->error = 0xa; state->reason = "Invalid header value char"; state->error_pos = (const char*) p; @@ -7858,12 +7813,12 @@ static llparse_state_t llhttp__internal__run( case 1: goto s_n_llhttp__internal__n_header_value_discard_ws; default: - goto s_n_llhttp__internal__n_error_47; + goto s_n_llhttp__internal__n_error_46; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_49: { + s_n_llhttp__internal__n_error_48: { state->error = 0xb; state->reason = "Empty Content-Length"; state->error_pos = (const char*) p; @@ -7881,7 +7836,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_48: { + s_n_llhttp__internal__n_error_47: { state->error = 0x1d; state->reason = "`on_header_value_complete` callback error"; state->error_pos = (const char*) p; @@ -7966,14 +7921,14 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_load_header_state_1: { switch (llhttp__internal__c_load_header_state(state, p, endp)) { case 2: - goto s_n_llhttp__internal__n_error_49; + goto s_n_llhttp__internal__n_error_48; default: goto s_n_llhttp__internal__n_invoke_load_header_state_2; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_46: { + s_n_llhttp__internal__n_error_45: { state->error = 0xa; state->reason = "Invalid header value char"; state->error_pos = (const char*) p; @@ -7987,12 +7942,12 @@ static llparse_state_t llhttp__internal__run( case 1: goto s_n_llhttp__internal__n_header_value_discard_lws; default: - goto s_n_llhttp__internal__n_error_46; + goto s_n_llhttp__internal__n_error_45; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_50: { + s_n_llhttp__internal__n_error_49: { state->error = 0x2; state->reason = "Expected LF after CR"; state->error_pos = (const char*) p; @@ -8006,7 +7961,7 @@ static llparse_state_t llhttp__internal__run( case 1: goto s_n_llhttp__internal__n_header_value_discard_lws; default: - goto s_n_llhttp__internal__n_error_50; + goto s_n_llhttp__internal__n_error_49; } /* UNREACHABLE */; abort(); @@ -8029,25 +7984,6 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_52: { - state->error = 0xa; - state->reason = "Unexpected whitespace after header value"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } - s_n_llhttp__internal__n_invoke_test_lenient_flags_18: { - switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) { - case 1: - goto s_n_llhttp__internal__n_invoke_load_header_state_4; - default: - goto s_n_llhttp__internal__n_error_52; - } - /* UNREACHABLE */; - abort(); - } s_n_llhttp__internal__n_invoke_update_header_state_2: { switch (llhttp__internal__c_update_header_state(state, p, endp)) { default: @@ -8104,7 +8040,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_53: { + s_n_llhttp__internal__n_error_51: { state->error = 0x3; state->reason = "Missing expected LF after header value"; state->error_pos = (const char*) p; @@ -8113,7 +8049,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_51: { + s_n_llhttp__internal__n_error_50: { state->error = 0x19; state->reason = "Missing expected CR after header value"; state->error_pos = (const char*) p; @@ -8202,14 +8138,14 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_54; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_52; return s_error; } - goto s_n_llhttp__internal__n_error_54; + goto s_n_llhttp__internal__n_error_52; /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_19: { + s_n_llhttp__internal__n_invoke_test_lenient_flags_18: { switch (llhttp__internal__c_test_lenient_flags(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_header_value_lenient; @@ -8317,10 +8253,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_54; return s_error; } - goto s_n_llhttp__internal__n_error_56; + goto s_n_llhttp__internal__n_error_54; /* UNREACHABLE */; abort(); } @@ -8352,14 +8288,14 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_55; return s_error; } - goto s_n_llhttp__internal__n_error_57; + goto s_n_llhttp__internal__n_error_55; /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_55: { + s_n_llhttp__internal__n_error_53: { state->error = 0x4; state->reason = "Duplicate Content-Length"; state->error_pos = (const char*) p; @@ -8373,7 +8309,7 @@ static llparse_state_t llhttp__internal__run( case 0: goto s_n_llhttp__internal__n_header_value_content_length; default: - goto s_n_llhttp__internal__n_error_55; + goto s_n_llhttp__internal__n_error_53; } /* UNREACHABLE */; abort(); @@ -8388,11 +8324,11 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) (p + 1); - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_59; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57; return s_error; } p++; - goto s_n_llhttp__internal__n_error_59; + goto s_n_llhttp__internal__n_error_57; /* UNREACHABLE */; abort(); } @@ -8414,16 +8350,16 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) (p + 1); - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_58; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56; return s_error; } p++; - goto s_n_llhttp__internal__n_error_58; + goto s_n_llhttp__internal__n_error_56; /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_20: { - switch (llhttp__internal__c_test_lenient_flags_20(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_19: { + switch (llhttp__internal__c_test_lenient_flags_19(state, p, endp)) { case 0: goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_8; default: @@ -8435,7 +8371,7 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_load_type_1: { switch (llhttp__internal__c_load_type(state, p, endp)) { case 1: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_20; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_19; default: goto s_n_llhttp__internal__n_header_value_te_chunked; } @@ -8466,8 +8402,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_21: { - switch (llhttp__internal__c_test_lenient_flags_20(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_20: { + switch (llhttp__internal__c_test_lenient_flags_19(state, p, endp)) { case 0: goto s_n_llhttp__internal__n_span_end_llhttp__on_header_value_9; default: @@ -8479,7 +8415,7 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_load_type_2: { switch (llhttp__internal__c_load_type(state, p, endp)) { case 1: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_21; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_20; default: goto s_n_llhttp__internal__n_invoke_or_flags_19; } @@ -8528,10 +8464,10 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_22: { - switch (llhttp__internal__c_test_lenient_flags_22(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_21: { + switch (llhttp__internal__c_test_lenient_flags_21(state, p, endp)) { case 0: - goto s_n_llhttp__internal__n_error_60; + goto s_n_llhttp__internal__n_error_58; default: goto s_n_llhttp__internal__n_header_value_discard_ws; } @@ -8541,14 +8477,14 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_test_flags_4: { switch (llhttp__internal__c_test_flags_4(state, p, endp)) { case 1: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_22; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_21; default: goto s_n_llhttp__internal__n_header_value_discard_ws; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_61: { + s_n_llhttp__internal__n_error_59: { state->error = 0xf; state->reason = "Transfer-Encoding can't be present with Content-Length"; state->error_pos = (const char*) p; @@ -8557,10 +8493,10 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_23: { - switch (llhttp__internal__c_test_lenient_flags_22(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_22: { + switch (llhttp__internal__c_test_lenient_flags_21(state, p, endp)) { case 0: - goto s_n_llhttp__internal__n_error_61; + goto s_n_llhttp__internal__n_error_59; default: goto s_n_llhttp__internal__n_header_value_discard_ws; } @@ -8570,7 +8506,7 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_test_flags_5: { switch (llhttp__internal__c_test_flags_2(state, p, endp)) { case 1: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_23; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_22; default: goto s_n_llhttp__internal__n_header_value_discard_ws; } @@ -8586,7 +8522,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_45: { + s_n_llhttp__internal__n_error_44: { state->error = 0x1c; state->reason = "`on_header_field_complete` callback error"; state->error_pos = (const char*) p; @@ -8631,7 +8567,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_62: { + s_n_llhttp__internal__n_error_60: { state->error = 0xa; state->reason = "Invalid header token"; state->error_pos = (const char*) p; @@ -8746,7 +8682,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_63: { + s_n_llhttp__internal__n_error_61: { state->error = 0x7; state->reason = "Expected CRLF"; state->error_pos = (const char*) p; @@ -8772,7 +8708,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_71: { + s_n_llhttp__internal__n_error_69: { state->error = 0x17; state->reason = "Pause on PRI/Upgrade"; state->error_pos = (const char*) p; @@ -8781,7 +8717,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_72: { + s_n_llhttp__internal__n_error_70: { state->error = 0x9; state->reason = "Expected HTTP/2 Connection Preface"; state->error_pos = (const char*) p; @@ -8790,7 +8726,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_69: { + s_n_llhttp__internal__n_error_67: { state->error = 0x2; state->reason = "Expected CRLF after version"; state->error_pos = (const char*) p; @@ -8799,17 +8735,17 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_26: { + s_n_llhttp__internal__n_invoke_test_lenient_flags_25: { switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_headers_start; default: - goto s_n_llhttp__internal__n_error_69; + goto s_n_llhttp__internal__n_error_67; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_68: { + s_n_llhttp__internal__n_error_66: { state->error = 0x9; state->reason = "Expected CRLF after version"; state->error_pos = (const char*) p; @@ -8818,17 +8754,17 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_25: { + s_n_llhttp__internal__n_invoke_test_lenient_flags_24: { switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_req_http_complete_crlf; default: - goto s_n_llhttp__internal__n_error_68; + goto s_n_llhttp__internal__n_error_66; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_70: { + s_n_llhttp__internal__n_error_68: { state->error = 0x9; state->reason = "Expected CRLF after version"; state->error_pos = (const char*) p; @@ -8846,7 +8782,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_67: { + s_n_llhttp__internal__n_error_65: { state->error = 0x21; state->reason = "`on_version_complete` callback error"; state->error_pos = (const char*) p; @@ -8882,10 +8818,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_66; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_64; return s_error; } - goto s_n_llhttp__internal__n_error_66; + goto s_n_llhttp__internal__n_error_64; /* UNREACHABLE */; abort(); } @@ -8935,8 +8871,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_24: { - switch (llhttp__internal__c_test_lenient_flags_24(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_23: { + switch (llhttp__internal__c_test_lenient_flags_23(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_span_end_llhttp__on_version_1; default: @@ -8948,7 +8884,7 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_store_http_minor: { switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) { default: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_24; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_23; } /* UNREACHABLE */; abort(); @@ -8963,10 +8899,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_73; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_71; return s_error; } - goto s_n_llhttp__internal__n_error_73; + goto s_n_llhttp__internal__n_error_71; /* UNREACHABLE */; abort(); } @@ -8980,10 +8916,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_74; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_72; return s_error; } - goto s_n_llhttp__internal__n_error_74; + goto s_n_llhttp__internal__n_error_72; /* UNREACHABLE */; abort(); } @@ -9005,14 +8941,14 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_75; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_73; return s_error; } - goto s_n_llhttp__internal__n_error_75; + goto s_n_llhttp__internal__n_error_73; /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_65: { + s_n_llhttp__internal__n_error_63: { state->error = 0x8; state->reason = "Invalid method for HTTP/x.x request"; state->error_pos = (const char*) p; @@ -9093,15 +9029,13 @@ static llparse_state_t llhttp__internal__run( goto s_n_llhttp__internal__n_span_start_llhttp__on_version; case 34: goto s_n_llhttp__internal__n_span_start_llhttp__on_version; - case 46: - goto s_n_llhttp__internal__n_span_start_llhttp__on_version; default: - goto s_n_llhttp__internal__n_error_65; + goto s_n_llhttp__internal__n_error_63; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_78: { + s_n_llhttp__internal__n_error_76: { state->error = 0x8; state->reason = "Expected HTTP/"; state->error_pos = (const char*) p; @@ -9110,7 +9044,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_76: { + s_n_llhttp__internal__n_error_74: { state->error = 0x8; state->reason = "Expected SOURCE method for ICE/x.x request"; state->error_pos = (const char*) p; @@ -9124,12 +9058,12 @@ static llparse_state_t llhttp__internal__run( case 33: goto s_n_llhttp__internal__n_span_start_llhttp__on_version; default: - goto s_n_llhttp__internal__n_error_76; + goto s_n_llhttp__internal__n_error_74; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_77: { + s_n_llhttp__internal__n_error_75: { state->error = 0x8; state->reason = "Invalid method for RTSP/x.x request"; state->error_pos = (const char*) p; @@ -9169,7 +9103,7 @@ static llparse_state_t llhttp__internal__run( case 45: goto s_n_llhttp__internal__n_span_start_llhttp__on_version; default: - goto s_n_llhttp__internal__n_error_77; + goto s_n_llhttp__internal__n_error_75; } /* UNREACHABLE */; abort(); @@ -9183,7 +9117,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_64: { + s_n_llhttp__internal__n_error_62: { state->error = 0x1a; state->reason = "`on_url_complete` callback error"; state->error_pos = (const char*) p; @@ -9199,7 +9133,7 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_22; default: - goto s_n_llhttp__internal__n_error_64; + goto s_n_llhttp__internal__n_error_62; } /* UNREACHABLE */; abort(); @@ -9272,7 +9206,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_79: { + s_n_llhttp__internal__n_error_77: { state->error = 0x7; state->reason = "Invalid char in url fragment start"; state->error_pos = (const char*) p; @@ -9332,7 +9266,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_80: { + s_n_llhttp__internal__n_error_78: { state->error = 0x7; state->reason = "Invalid char in url query"; state->error_pos = (const char*) p; @@ -9341,7 +9275,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_81: { + s_n_llhttp__internal__n_error_79: { state->error = 0x7; state->reason = "Invalid char in url path"; state->error_pos = (const char*) p; @@ -9452,7 +9386,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_82: { + s_n_llhttp__internal__n_error_80: { state->error = 0x7; state->reason = "Double @ in url"; state->error_pos = (const char*) p; @@ -9461,7 +9395,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_83: { + s_n_llhttp__internal__n_error_81: { state->error = 0x7; state->reason = "Unexpected char in url server"; state->error_pos = (const char*) p; @@ -9470,9 +9404,27 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } + s_n_llhttp__internal__n_error_82: { + state->error = 0x7; + state->reason = "Unexpected char in url server"; + state->error_pos = (const char*) p; + state->_current = (void*) (intptr_t) s_error; + return s_error; + /* UNREACHABLE */; + abort(); + } + s_n_llhttp__internal__n_error_83: { + state->error = 0x7; + state->reason = "Unexpected char in url schema"; + state->error_pos = (const char*) p; + state->_current = (void*) (intptr_t) s_error; + return s_error; + /* UNREACHABLE */; + abort(); + } s_n_llhttp__internal__n_error_84: { state->error = 0x7; - state->reason = "Unexpected char in url server"; + state->reason = "Unexpected char in url schema"; state->error_pos = (const char*) p; state->_current = (void*) (intptr_t) s_error; return s_error; @@ -9480,24 +9432,6 @@ static llparse_state_t llhttp__internal__run( abort(); } s_n_llhttp__internal__n_error_85: { - state->error = 0x7; - state->reason = "Unexpected char in url schema"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } - s_n_llhttp__internal__n_error_86: { - state->error = 0x7; - state->reason = "Unexpected char in url schema"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } - s_n_llhttp__internal__n_error_87: { state->error = 0x7; state->reason = "Unexpected start char in url"; state->error_pos = (const char*) p; @@ -9516,7 +9450,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_88: { + s_n_llhttp__internal__n_error_86: { state->error = 0x6; state->reason = "Expected space after method"; state->error_pos = (const char*) p; @@ -9534,7 +9468,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_107: { + s_n_llhttp__internal__n_error_105: { state->error = 0x20; state->reason = "`on_method_complete` callback error"; state->error_pos = (const char*) p; @@ -9568,7 +9502,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_108: { + s_n_llhttp__internal__n_error_106: { state->error = 0x6; state->reason = "Invalid method encountered"; state->error_pos = (const char*) p; @@ -9577,15 +9511,6 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_100: { - state->error = 0xd; - state->reason = "Invalid status code"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } s_n_llhttp__internal__n_error_98: { state->error = 0xd; state->reason = "Invalid status code"; @@ -9604,6 +9529,15 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } + s_n_llhttp__internal__n_error_94: { + state->error = 0xd; + state->reason = "Invalid status code"; + state->error_pos = (const char*) p; + state->_current = (void*) (intptr_t) s_error; + return s_error; + /* UNREACHABLE */; + abort(); + } s_n_llhttp__internal__n_pause_24: { state->error = 0x15; state->reason = "on_status_complete pause"; @@ -9613,7 +9547,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_92: { + s_n_llhttp__internal__n_error_90: { state->error = 0x1b; state->reason = "`on_status_complete` callback error"; state->error_pos = (const char*) p; @@ -9629,12 +9563,12 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_24; default: - goto s_n_llhttp__internal__n_error_92; + goto s_n_llhttp__internal__n_error_90; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_91: { + s_n_llhttp__internal__n_error_89: { state->error = 0xd; state->reason = "Invalid response status"; state->error_pos = (const char*) p; @@ -9643,17 +9577,17 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_28: { + s_n_llhttp__internal__n_invoke_test_lenient_flags_27: { switch (llhttp__internal__c_test_lenient_flags_1(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete; default: - goto s_n_llhttp__internal__n_error_91; + goto s_n_llhttp__internal__n_error_89; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_93: { + s_n_llhttp__internal__n_error_91: { state->error = 0x2; state->reason = "Expected LF after CR"; state->error_pos = (const char*) p; @@ -9662,17 +9596,17 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_29: { + s_n_llhttp__internal__n_invoke_test_lenient_flags_28: { switch (llhttp__internal__c_test_lenient_flags_8(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete; default: - goto s_n_llhttp__internal__n_error_93; + goto s_n_llhttp__internal__n_error_91; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_94: { + s_n_llhttp__internal__n_error_92: { state->error = 0x19; state->reason = "Missing expected CR after response line"; state->error_pos = (const char*) p; @@ -9691,11 +9625,11 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) (p + 1); - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_test_lenient_flags_30; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_invoke_test_lenient_flags_29; return s_error; } p++; - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_30; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_29; /* UNREACHABLE */; abort(); } @@ -9717,7 +9651,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_95: { + s_n_llhttp__internal__n_error_93: { state->error = 0xd; state->reason = "Invalid response status"; state->error_pos = (const char*) p; @@ -9729,13 +9663,32 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_mul_add_status_code_2: { switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) { case 1: - goto s_n_llhttp__internal__n_error_96; + goto s_n_llhttp__internal__n_error_94; default: goto s_n_llhttp__internal__n_res_status_code_otherwise; } /* UNREACHABLE */; abort(); } + s_n_llhttp__internal__n_error_95: { + state->error = 0xd; + state->reason = "Invalid status code"; + state->error_pos = (const char*) p; + state->_current = (void*) (intptr_t) s_error; + return s_error; + /* UNREACHABLE */; + abort(); + } + s_n_llhttp__internal__n_invoke_mul_add_status_code_1: { + switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) { + case 1: + goto s_n_llhttp__internal__n_error_96; + default: + goto s_n_llhttp__internal__n_res_status_code_digit_3; + } + /* UNREACHABLE */; + abort(); + } s_n_llhttp__internal__n_error_97: { state->error = 0xd; state->reason = "Invalid status code"; @@ -9745,36 +9698,17 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_mul_add_status_code_1: { - switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) { - case 1: - goto s_n_llhttp__internal__n_error_98; - default: - goto s_n_llhttp__internal__n_res_status_code_digit_3; - } - /* UNREACHABLE */; - abort(); - } - s_n_llhttp__internal__n_error_99: { - state->error = 0xd; - state->reason = "Invalid status code"; - state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_error; - return s_error; - /* UNREACHABLE */; - abort(); - } s_n_llhttp__internal__n_invoke_mul_add_status_code: { switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) { case 1: - goto s_n_llhttp__internal__n_error_100; + goto s_n_llhttp__internal__n_error_98; default: goto s_n_llhttp__internal__n_res_status_code_digit_2; } /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_101: { + s_n_llhttp__internal__n_error_99: { state->error = 0xd; state->reason = "Invalid status code"; state->error_pos = (const char*) p; @@ -9791,7 +9725,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_102: { + s_n_llhttp__internal__n_error_100: { state->error = 0x9; state->reason = "Expected space after version"; state->error_pos = (const char*) p; @@ -9809,7 +9743,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_90: { + s_n_llhttp__internal__n_error_88: { state->error = 0x21; state->reason = "`on_version_complete` callback error"; state->error_pos = (const char*) p; @@ -9845,10 +9779,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_89; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_87; return s_error; } - goto s_n_llhttp__internal__n_error_89; + goto s_n_llhttp__internal__n_error_87; /* UNREACHABLE */; abort(); } @@ -9898,8 +9832,8 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_invoke_test_lenient_flags_27: { - switch (llhttp__internal__c_test_lenient_flags_24(state, p, endp)) { + s_n_llhttp__internal__n_invoke_test_lenient_flags_26: { + switch (llhttp__internal__c_test_lenient_flags_23(state, p, endp)) { case 1: goto s_n_llhttp__internal__n_span_end_llhttp__on_version_6; default: @@ -9911,7 +9845,7 @@ static llparse_state_t llhttp__internal__run( s_n_llhttp__internal__n_invoke_store_http_minor_1: { switch (llhttp__internal__c_store_http_minor(state, p, endp, match)) { default: - goto s_n_llhttp__internal__n_invoke_test_lenient_flags_27; + goto s_n_llhttp__internal__n_invoke_test_lenient_flags_26; } /* UNREACHABLE */; abort(); @@ -9926,10 +9860,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_103; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_101; return s_error; } - goto s_n_llhttp__internal__n_error_103; + goto s_n_llhttp__internal__n_error_101; /* UNREACHABLE */; abort(); } @@ -9943,10 +9877,10 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_104; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_102; return s_error; } - goto s_n_llhttp__internal__n_error_104; + goto s_n_llhttp__internal__n_error_102; /* UNREACHABLE */; abort(); } @@ -9968,14 +9902,14 @@ static llparse_state_t llhttp__internal__run( if (err != 0) { state->error = err; state->error_pos = (const char*) p; - state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_105; + state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_103; return s_error; } - goto s_n_llhttp__internal__n_error_105; + goto s_n_llhttp__internal__n_error_103; /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_109: { + s_n_llhttp__internal__n_error_107: { state->error = 0x8; state->reason = "Expected HTTP/"; state->error_pos = (const char*) p; @@ -10035,7 +9969,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_106: { + s_n_llhttp__internal__n_error_104: { state->error = 0x8; state->reason = "Invalid word encountered"; state->error_pos = (const char*) p; @@ -10108,7 +10042,7 @@ static llparse_state_t llhttp__internal__run( /* UNREACHABLE */; abort(); } - s_n_llhttp__internal__n_error_110: { + s_n_llhttp__internal__n_error_108: { state->error = 0x1f; state->reason = "`on_reset` callback error"; state->error_pos = (const char*) p; @@ -10124,7 +10058,7 @@ static llparse_state_t llhttp__internal__run( case 21: goto s_n_llhttp__internal__n_pause_28; default: - goto s_n_llhttp__internal__n_error_110; + goto s_n_llhttp__internal__n_error_108; } /* UNREACHABLE */; abort(); diff --git a/hpsocket/GlobalErrno.h b/hpsocket/GlobalErrno.h index 4e1eed9..83ced74 100644 --- a/hpsocket/GlobalErrno.h +++ b/hpsocket/GlobalErrno.h @@ -79,7 +79,6 @@ #define ERROR_OUT_OF_RANGE ERANGE #define ERROR_DESTINATION_ELEMENT_FULL EXFULL #define ERROR_ALREADY_INITIALIZED EALREADY -#define ERROR_CANT_WAIT EIO #define EXIT_CODE_OK EX_OK #define EXIT_CODE_CONFIG EX_CONFIG diff --git a/hpsocket/HPSocket4C.h b/hpsocket/HPSocket4C.h index 22f612a..acaaee6 100644 --- a/hpsocket/HPSocket4C.h +++ b/hpsocket/HPSocket4C.h @@ -1032,8 +1032,6 @@ HPSOCKET_API BOOL __HP_CALL HP_TcpAgent_SendSmallFile(HP_Agent pAgent, HP_CONNID /**********************************************************************************/ /***************************** TCP Agent 属性访问方法 *****************************/ -/* 设置同步连接超时时间（毫秒） */ -HPSOCKET_API void __HP_CALL HP_TcpAgent_SetSyncConnectTimeout(HP_TcpAgent pAgent, DWORD dwSyncConnectTimeout); /* 设置通信数据缓冲区大小（根据平均通信数据包大小调整设置，通常设置为 1024 的倍数） */ HPSOCKET_API void __HP_CALL HP_TcpAgent_SetSocketBufferSize(HP_TcpAgent pAgent, DWORD dwSocketBufferSize); /* 设置正常心跳包间隔（毫秒，0 则不发送心跳包，默认：60 * 1000） */ @@ -1043,8 +1041,6 @@ HPSOCKET_API void __HP_CALL HP_TcpAgent_SetKeepAliveInterval(HP_TcpAgent pAgent, /* 设置是否开启 nodelay 模式（默认：FALSE，不开启） */ HPSOCKET_API void __HP_CALL HP_TcpAgent_SetNoDelay(HP_TcpAgent pAgent, BOOL bNoDelay); -/* 获取同步连接超时时间 */ -HPSOCKET_API DWORD __HP_CALL HP_TcpAgent_GetSyncConnectTimeout(HP_TcpAgent pAgent); /* 获取通信数据缓冲区大小 */ HPSOCKET_API DWORD __HP_CALL HP_TcpAgent_GetSocketBufferSize(HP_TcpAgent pAgent); /* 获取正常心跳包间隔 */ @@ -1225,8 +1221,6 @@ HPSOCKET_API BOOL __HP_CALL HP_TcpClient_SendSmallFile(HP_Client pClient, LPCTST /**********************************************************************************/ /***************************** TCP Client 属性访问方法 *****************************/ -/* 设置同步连接超时时间（毫秒） */ -HPSOCKET_API void __HP_CALL HP_TcpClient_SetSyncConnectTimeout(HP_TcpClient pClient, DWORD dwSyncConnectTimeout); /* 设置通信数据缓冲区大小（根据平均通信数据包大小调整设置，通常设置为：(N * 1024) - sizeof(TBufferObj)） */ HPSOCKET_API void __HP_CALL HP_TcpClient_SetSocketBufferSize(HP_TcpClient pClient, DWORD dwSocketBufferSize); /* 设置正常心跳包间隔（毫秒，0 则不发送心跳包，默认：60 * 1000） */ @@ -1236,8 +1230,6 @@ HPSOCKET_API void __HP_CALL HP_TcpClient_SetKeepAliveInterval(HP_TcpClient pClie /* 设置是否开启 nodelay 模式（默认：FALSE，不开启） */ HPSOCKET_API void __HP_CALL HP_TcpClient_SetNoDelay(HP_TcpClient pClient, BOOL bNoDelay); -/* 获取同步连接超时时间 */ -HPSOCKET_API DWORD __HP_CALL HP_TcpClient_GetSyncConnectTimeout(HP_TcpClient pClient); /* 获取通信数据缓冲区大小 */ HPSOCKET_API DWORD __HP_CALL HP_TcpClient_GetSocketBufferSize(HP_TcpClient pClient); /* 获取正常心跳包间隔 */ diff --git a/hpsocket/HPTypeDef.h b/hpsocket/HPTypeDef.h index 1f84c93..5e1d9e5 100644 --- a/hpsocket/HPTypeDef.h +++ b/hpsocket/HPTypeDef.h @@ -26,9 +26,9 @@ #include "GlobalDef.h" /* HP-Socket 版本号 */ -#define HP_VERSION_MAJOR 6 // 主版本号 -#define HP_VERSION_MINOR 0 // 子版本号 -#define HP_VERSION_REVISE 3 // 修正版本号 +#define HP_VERSION_MAJOR 5 // 主版本号 +#define HP_VERSION_MINOR 9 // 子版本号 +#define HP_VERSION_REVISE 6 // 修正版本号 #define HP_VERSION_BUILD 1 // 构建编号 //#define _UDP_DISABLED // 禁用 UDP @@ -204,7 +204,6 @@ typedef enum EnSocketError SE_NETWORK = 12, // 网络错误 SE_DATA_PROC = 13, // 数据处理错误 SE_DATA_SEND = 14, // 数据发送失败 - SE_GC_START = 15, // 垃圾回收启动失败 /***** SSL Socket 扩展操作结果代码 *****/ SE_SSL_ENV_NOT_READY = 101, // SSL 环境未就绪 diff --git a/hpsocket/SocketInterface.h b/hpsocket/SocketInterface.h index c3cc68b..81398a7 100644 --- a/hpsocket/SocketInterface.h +++ b/hpsocket/SocketInterface.h @@ -758,8 +758,6 @@ public: /***********************************************************************/ /***************************** 属性访问方法 *****************************/ - /* 设置同步连接超时时间（毫秒） */ - virtual void SetSyncConnectTimeout (DWORD dwSyncConnectTimeout) = 0; /* 设置通信数据缓冲区大小（根据平均通信数据包大小调整设置，通常设置为 1024 的倍数） */ virtual void SetSocketBufferSize (DWORD dwSocketBufferSize) = 0; /* 设置正常心跳包间隔（毫秒，0 则不发送心跳包，默认：60 * 1000） */ @@ -769,8 +767,6 @@ public: /* 设置是否开启 nodelay 模式（默认：FALSE，不开启） */ virtual void SetNoDelay (BOOL bNoDelay) = 0; - /* 获取同步连接超时时间 */ - virtual DWORD GetSyncConnectTimeout () = 0; /* 获取通信数据缓冲区大小 */ virtual DWORD GetSocketBufferSize () = 0; /* 获取正常心跳包间隔 */ @@ -1017,19 +1013,15 @@ public: /***********************************************************************/ /***************************** 属性访问方法 *****************************/ - /* 设置同步连接超时时间（毫秒） */ - virtual void SetSyncConnectTimeout (DWORD dwSyncConnectTimeout) = 0; /* 设置通信数据缓冲区大小（根据平均通信数据包大小调整设置，通常设置为：(N * 1024) - sizeof(TBufferObj)） */ - virtual void SetSocketBufferSize (DWORD dwSocketBufferSize) = 0; + virtual void SetSocketBufferSize (DWORD dwSocketBufferSize) = 0; /* 设置正常心跳包间隔（毫秒，0 则不发送心跳包，默认：60 * 1000） */ - virtual void SetKeepAliveTime (DWORD dwKeepAliveTime) = 0; + virtual void SetKeepAliveTime (DWORD dwKeepAliveTime) = 0; /* 设置异常心跳包间隔（毫秒，0 不发送心跳包，，默认：20 * 1000，如果超过若干次 [默认：WinXP 5 次, Win7 10 次] 检测不到心跳确认包则认为已断线） */ - virtual void SetKeepAliveInterval (DWORD dwKeepAliveInterval) = 0; + virtual void SetKeepAliveInterval (DWORD dwKeepAliveInterval) = 0; /* 设置是否开启 nodelay 模式（默认：FALSE，不开启） */ - virtual void SetNoDelay (BOOL bNoDelay) = 0; + virtual void SetNoDelay (BOOL bNoDelay) = 0; - /* 获取同步连接超时时间 */ - virtual DWORD GetSyncConnectTimeout () = 0; /* 获取通信数据缓冲区大小 */ virtual DWORD GetSocketBufferSize () = 0; /* 获取正常心跳包间隔 */