Partydeck/Websocket-Extension
3
0
Fork 0
mirror of https://github.com/defold/extension-websocket.git synced 2025-06-27 09:47:44 +02:00
Code Issues Projects Releases Wiki Activity

replace dmStriCmp with dmStrCaseCmp (#31)

Browse Source
This commit is contained in:
Alexander Palagin 2021-02-10 08:50:09 +02:00 committed by GitHub
parent 165b7333dc
commit 7346f142fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websocket/src/handshake.cpp
View File

@ -260,8 +260,8 @@ Result VerifyHeaders(WebsocketConnection* conn)
connection_header = response->GetHeader("Connection"); connection_header = response->GetHeader("Connection");
upgrade_header = response->GetHeader("Upgrade"); upgrade_header = response->GetHeader("Upgrade");
websocket_secret_header = response->GetHeader("Sec-WebSocket-Accept"); websocket_secret_header = response->GetHeader("Sec-WebSocket-Accept");
bool connection = connection_header && dmStriCmp(connection_header->m_Value, "Upgrade") == 0; bool connection = connection_header && dmStrCaseCmp(connection_header->m_Value, "Upgrade") == 0;
bool upgrade = upgrade_header && dmStriCmp(upgrade_header->m_Value, "websocket") == 0; bool upgrade = upgrade_header && dmStrCaseCmp(upgrade_header->m_Value, "websocket") == 0;
bool valid_key = websocket_secret_header && ValidateSecretKey(conn, websocket_secret_header->m_Value); bool valid_key = websocket_secret_header && ValidateSecretKey(conn, websocket_secret_header->m_Value);
// Send error to lua? // Send error to lua?

15
websocket/src/websocket.cpp
View File

@ -64,19 +64,6 @@ const char* StateToString(State err)
#undef STRING_CASE #undef STRING_CASE
int dmStriCmp(const char* s1, const char* s2)
{
for (;;)
{
if (!*s1 || !*s2 || tolower((unsigned char) *s1) != tolower((unsigned char) *s2))
{
return (unsigned char) *s1 - (unsigned char) *s2;
}
s1++;
s2++;
}
}
void DebugLog(int level, const char* fmt, ...) void DebugLog(int level, const char* fmt, ...)
{ {
if (level > g_DebugWebSocket) if (level > g_DebugWebSocket)
@ -444,7 +431,7 @@ HttpHeader* HandshakeResponse::GetHeader(const char* header_key)
{ {
for(uint32_t i = 0; i < m_Headers.Size(); ++i) for(uint32_t i = 0; i < m_Headers.Size(); ++i)
{ {
if (dmStriCmp(m_Headers[i]->m_Key, header_key) == 0) if (dmStrCaseCmp(m_Headers[i]->m_Key, header_key) == 0)
{ {
return m_Headers[i]; return m_Headers[i];
} }

2
websocket/src/websocket.h
View File

@ -169,7 +169,5 @@ namespace dmWebsocket
#else #else
void DebugLog(int level, const char* fmt, ...); void DebugLog(int level, const char* fmt, ...);
#endif #endif
int dmStriCmp(const char* s1, const char* s2);
void DebugPrint(int level, const char* msg, const void* _bytes, uint32_t num_bytes); void DebugPrint(int level, const char* msg, const void* _bytes, uint32_t num_bytes);
} }