source/sourcemod
1
0
Fork 0
mirror of https://github.com/alliedmodders/sourcemod.git synced 2025-12-07 10:28:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplified and removed unused code

Browse Source
This commit is contained in:
Nefarius 2014-06-11 11:13:16 +02:00 committed by Nicholas Hastings
parent 8c45fcfc5d
commit 528b62ea64
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
extensions/curl/extension.cpp
View File

@ -48,12 +48,15 @@ CurlExt curl_ext; /**< Global singleton for extension's main interface */
SMEXT_LINK(&curl_ext);
#if 0
SessionHandler g_SessionHandler;
HandleType_t g_SessionHandle = 0;
FormHandler g_FormHandler;
HandleType_t g_FormHandle = 0;
DownloadHandler g_DownloadHandler;
#endif
HandleType_t g_SessionHandle = 0;
HandleType_t g_FormHandle = 0;
HandleType_t g_DownloadHandle = 0;
HTTPHandleDispatcher g_HTTPHandler;
HTTPSessionManager& g_SessionManager = HTTPSessionManager::instance();
bool CurlExt::SDK_OnLoad(char *error, size_t maxlength, bool late)
@ -82,23 +85,24 @@ bool CurlExt::SDK_OnLoad(char *error, size_t maxlength, bool late)
// Register natives
g_pShareSys->AddNatives(myself, curlext_natives);
// Register session handle handler
HandleAccess sessionRules;
g_pHandleSys->InitAccessDefaults(NULL, &sessionRules);
sessionRules.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
HandleAccess hacc;
g_pHandleSys->InitAccessDefaults(NULL, &hacc);
hacc.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
g_SessionHandle = g_pHandleSys->CreateType("HTTPSession",
&g_SessionHandler, 0, 0, &sessionRules, myself->GetIdentity(), NULL);
&g_HTTPHandler, 0, 0, &hacc, myself->GetIdentity(), NULL);
// Register web form handle handler
HandleAccess formRules;
g_pHandleSys->InitAccessDefaults(NULL, &formRules);
formRules.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY;
g_pHandleSys->InitAccessDefaults(NULL, &hacc);
hacc.access[HandleAccess_Delete] = HANDLE_RESTRICT_IDENTITY;
g_FormHandle = g_pHandleSys->CreateType("HTTPWebForm",
&g_FormHandler, 0, 0, &formRules, myself->GetIdentity(), NULL);
&g_HTTPHandler, 0, 0, &hacc, myself->GetIdentity(), NULL);
// Register download handle handler
HandleAccess dldrRules;
g_pHandleSys->InitAccessDefaults(NULL, &dldrRules);
dldrRules.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
g_pHandleSys->InitAccessDefaults(NULL, &hacc);
hacc.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY;
g_DownloadHandle = g_pHandleSys->CreateType("HTTPDownloader",
&g_DownloadHandler, 0, 0, &dldrRules, myself->GetIdentity(), NULL);
&g_HTTPHandler, 0, 0, &hacc, myself->GetIdentity(), NULL);
plsys->AddPluginsListener(this);
smutils->AddGameFrameHook(&OnGameFrame);
g_SessionManager.Initialize();
@ -374,8 +378,6 @@ static cell_t HTTP_PostAndDownload(IPluginContext *pCtx, const cell_t *params)
HTTPRequestCompletedContextPack contextPack;
contextPack.pCallbackFunction = new HTTPRequestCompletedContextFunction;
// TODO: this might be obsolete
contextPack.pCallbackFunction->pContext = pCtx;
// 5th param: callback function
contextPack.pCallbackFunction->uPluginFunction = params[5];
@ -441,8 +443,6 @@ static cell_t HTTP_Download(IPluginContext *pCtx, const cell_t *params)
HTTPRequestCompletedContextPack contextPack;
contextPack.pCallbackFunction = new HTTPRequestCompletedContextFunction;
// TODO: this might be obsolete
contextPack.pCallbackFunction->pContext = pCtx;
// 4th param: callback function
contextPack.pCallbackFunction->uPluginFunction = params[4];
@ -856,3 +856,19 @@ void HTTPSessionManager::HTTPAsyncRequestHandler::RunThread(IThreadHandle *pHand
g_SessionManager.AddCallback(request);
}
void HTTPHandleDispatcher::OnHandleDestroy(HandleType_t type, void *object)
{
if (type == g_SessionHandle)
{
delete ((IWebTransfer *)object);
}
else if (type == g_DownloadHandle)
{
delete ((IBaseDownloader *)object);
}
else if (type == g_FormHandle)
{
delete ((IWebForm *)object);
}
}

15
extensions/curl/extension.h
View File

@ -130,6 +130,16 @@ size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...);
size_t UTIL_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list ap);
// Handle helper class
class HTTPHandleDispatcher : public IHandleTypeDispatch
{
public:
virtual void OnHandleDestroy(HandleType_t type, void *object);
};
extern HTTPHandleDispatcher g_HTTPHandler;
#if 0
class SessionHandler : public IHandleTypeDispatch
{
public:
@ -163,10 +173,9 @@ class DownloadHandler : public IHandleTypeDispatch
extern DownloadHandler g_DownloadHandler;
extern HandleType_t g_DownloadHandle;
#endif
struct HTTPRequestCompletedContextFunction {
// TODO: remove as it's redundant
IPluginContext *pContext;
funcid_t uPluginFunction;
bool bHasContext;
};
@ -230,6 +239,7 @@ private:
const char *url;
HTTPRequestCompletedContextPack contextPack;
cell_t result;
bool operator==(const HTTPRequest& lhs) const
{
return !memcmp(&lhs, this, sizeof(HTTPRequest));
@ -263,7 +273,6 @@ private:
{
delete this;
}
static void ExecuteCallback(void *data);
};
};