MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-22 11:13:21 +00:00
Code Issues Releases Wiki Activity

untested changes

Browse Source
This commit is contained in:
Bryan Roe
2020-05-06 14:03:41 -07:00
parent 5fb0cef7db
commit 47066bd825
3 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
microscript/ILibDuktape_HECI.c
View File

@@ -160,6 +160,8 @@ ILibTransport_DoneState ILibDuktape_HECI_Session_WriteHandler_Process(ILibDuktap
extern int ILibDuktape_HECI_Debug; extern int ILibDuktape_HECI_Debug;
#ifdef WIN32 #ifdef WIN32
BOOL ILibDuktape_HECI_Session_ReceiveSink(void *chain, HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user);
HANDLE ILibDuktape_HECI_windowsInit() HANDLE ILibDuktape_HECI_windowsInit()
{ {
PSP_DEVICE_INTERFACE_DETAIL_DATA deviceDetail = NULL; PSP_DEVICE_INTERFACE_DETAIL_DATA deviceDetail = NULL;
@@ -284,7 +286,7 @@ void ILibDuktape_HECI_Session_EmitStreamReady(void *chain, void *session)
} }
#ifdef WIN32 #ifdef WIN32
BOOL ILibDuktape_HECI_Session_WriteHandler_Ready(HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user) BOOL ILibDuktape_HECI_Session_WriteHandler_Ready(void *chain, HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user)
{ {
if (errors != ILibWaitHandle_ErrorStatus_NONE) { return(FALSE); } if (errors != ILibWaitHandle_ErrorStatus_NONE) { return(FALSE); }
@@ -293,7 +295,7 @@ BOOL ILibDuktape_HECI_Session_WriteHandler_Ready(HANDLE event, ILibWaitHandle_Er
if (!ILibMemory_CanaryOK(session)) { return(FALSE); } if (!ILibMemory_CanaryOK(session)) { return(FALSE); }
ILibProcessPipe_WaitHandle_Remove(session->mgr, session->wv.hEvent); ILibChain_RemoveWaitHandle(session->chain, session->wv.hEvent);
if (session->noPipelining == 0) if (session->noPipelining == 0)
{ {
@@ -378,7 +380,7 @@ ILibTransport_DoneState ILibDuktape_HECI_Session_WriteHandler_Process(ILibDuktap
{ {
// Not done writing // Not done writing
retVal = ILibTransport_DoneState_INCOMPLETE; retVal = ILibTransport_DoneState_INCOMPLETE;
ILibProcessPipe_WaitHandle_Add(session->mgr, session->wv.hEvent, session, ILibDuktape_HECI_Session_WriteHandler_Ready); ILibChain_AddWaitHandle(session->chain, session->wv.hEvent, -1, ILibDuktape_HECI_Session_WriteHandler_Ready, session);
} }
else else
{ {
@@ -471,7 +473,7 @@ ILibTransport_DoneState ILibDuktape_HECI_Session_WriteSink(ILibDuktape_DuplexStr
{ {
#if defined(WIN32) #if defined(WIN32)
state->returnIgnored = 1; state->returnIgnored = 1;
QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Session_WriteHandler, ILibProcessPipe_Manager_GetWorkerThread(session->mgr), (ULONG_PTR)state); ILibDuktape_HECI_Session_WriteHandler((ULONG_PTR)state);
#elif defined(_POSIX) #elif defined(_POSIX)
if (ILibIsRunningOnChainThread(stream->readableStream->chain) != 0) if (ILibIsRunningOnChainThread(stream->readableStream->chain) != 0)
{ {
@@ -520,20 +522,6 @@ void ILibDuktape_HECI_Session_PauseSink(ILibDuktape_DuplexStream *sender, void *
UNREFERENCED_PARAMETER(user); UNREFERENCED_PARAMETER(user);
#endif #endif
} }
#ifdef WIN32
BOOL ILibDuktape_HECI_Session_ReceiveSink(HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user);
void __stdcall ILibDuktape_HECI_Session_ResumeSink2(ULONG_PTR obj)
{
//if (ILibDuktape_HECI_Debug) { printf("ILibDuktape_HECI_Session_ResumeSink2()\n"); }
ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)obj;
BOOL result = ReadFile(session->descriptor, session->buffer, (DWORD)session->bufferSize, &(session->bytesRead), &(session->v));
if (result == TRUE || GetLastError() == ERROR_IO_PENDING)
{
//if (ILibDuktape_HECI_Debug) { printf("...[Wait Handle Added]\n"); }
ILibProcessPipe_WaitHandle_Add(session->mgr, session->v.hEvent, session, ILibDuktape_HECI_Session_ReceiveSink);
}
}
#endif
void ILibDuktape_HECI_Session_ResumeSink_NoPipeline(void *chain, void *user) void ILibDuktape_HECI_Session_ResumeSink_NoPipeline(void *chain, void *user)
{ {
// This is always called from the Microstack Thread // This is always called from the Microstack Thread
@@ -555,13 +543,16 @@ void ILibDuktape_HECI_Session_ResumeSink(ILibDuktape_DuplexStream *sender, void
ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user; ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user;
if (session->noPipelining != 0) if (session->noPipelining != 0)
{ {
Duktape_RunOnEventLoop(sender->readableStream->chain, duk_ctx_nonce(sender->readableStream->ctx), sender->readableStream->ctx, ILibDuktape_HECI_Session_ResumeSink_NoPipeline, NULL, session); ILibDuktape_HECI_Session_ResumeSink_NoPipeline(sender->readableStream->chain, session);
// Note: DO NOT 'return' here, because we still need to QueueUserAPC, to resume the stream on Windows
} }
#ifdef WIN32 #ifdef WIN32
// To Resume, we need to first context switch to the Windows Thread BOOL result = ReadFile(session->descriptor, session->buffer, (DWORD)session->bufferSize, &(session->bytesRead), &(session->v));
QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Session_ResumeSink2, ILibProcessPipe_Manager_GetWorkerThread(session->mgr), (ULONG_PTR)session); if (result == TRUE || GetLastError() == ERROR_IO_PENDING)
{
//if (ILibDuktape_HECI_Debug) { printf("...[Wait Handle Added]\n"); }
ILibChain_AddWaitHandle(session->chain, session->v.hEvent, -1, ILibDuktape_HECI_Session_ReceiveSink, session);
}
#endif #endif
} }
#ifdef WIN32 #ifdef WIN32
@@ -576,7 +567,7 @@ void ILibDuktape_HECI_Session_ReceiveSink2(void *chain, void *user)
ILibDuktape_HECI_Session_ResumeSink(session->stream, session->stream->user); ILibDuktape_HECI_Session_ResumeSink(session->stream, session->stream->user);
} }
} }
BOOL ILibDuktape_HECI_Session_ReceiveSink(HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user) BOOL ILibDuktape_HECI_Session_ReceiveSink(void *chain, HANDLE event, ILibWaitHandle_ErrorStatus errors, void* user)
{ {
//if (ILibDuktape_HECI_Debug) { printf("ILibDuktape_HECI_Session_ReceiveSink\n"); } //if (ILibDuktape_HECI_Debug) { printf("ILibDuktape_HECI_Session_ReceiveSink\n"); }
if (errors != ILibWaitHandle_ErrorStatus_NONE) if (errors != ILibWaitHandle_ErrorStatus_NONE)
@@ -589,7 +580,14 @@ BOOL ILibDuktape_HECI_Session_ReceiveSink(HANDLE event, ILibWaitHandle_ErrorStat
ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user; ILibDuktape_HECI_Session *session = (ILibDuktape_HECI_Session*)user;
if (ILibMemory_CanaryOK(session)) if (ILibMemory_CanaryOK(session))
{ {
if (GetOverlappedResult(session->descriptor, &(session->v), &(session->bytesRead), FALSE) == TRUE) { Duktape_RunOnEventLoop(session->chain, duk_ctx_nonce(session->stream->readableStream->ctx), session->stream->readableStream->ctx, ILibDuktape_HECI_Session_ReceiveSink2, NULL, session); } if (GetOverlappedResult(session->descriptor, &(session->v), &(session->bytesRead), FALSE) == TRUE)
{
ILibDuktape_DuplexStream_WriteData(session->stream, session->buffer, session->bytesRead);
if (session->stream != NULL && !session->stream->readableStream->paused)
{
ILibDuktape_HECI_Session_ResumeSink(session->stream, session->stream->user);
}
}
} }
return(FALSE); return(FALSE);
} }
@@ -601,7 +599,7 @@ void __stdcall ILibDuktape_HECI_Session_Start(ULONG_PTR obj)
BOOL result = ReadFile(session->descriptor, session->buffer, (DWORD)session->bufferSize, &bytesRead, &(session->v)); BOOL result = ReadFile(session->descriptor, session->buffer, (DWORD)session->bufferSize, &bytesRead, &(session->v));
//if (ILibDuktape_HECI_Debug) { printf("...[WaitHandle Added]\n"); } //if (ILibDuktape_HECI_Debug) { printf("...[WaitHandle Added]\n"); }
ILibProcessPipe_WaitHandle_Add(session->mgr, session->v.hEvent, session, ILibDuktape_HECI_Session_ReceiveSink); ILibChain_AddWaitHandle(session->chain, session->v.hEvent, -1, ILibDuktape_HECI_Session_ReceiveSink, session);
} }
#endif #endif
@@ -677,7 +675,7 @@ duk_ret_t ILibDuktape_HECI_create_OnClientConnect(duk_context *ctx)
duk_get_prop_string(ctx, -1, ILibDuktape_HECI_ChildProcess); // [HECI][childProcess] duk_get_prop_string(ctx, -1, ILibDuktape_HECI_ChildProcess); // [HECI][childProcess]
duk_get_prop_string(ctx, -1, ILibDuktape_ChildProcess_Manager); // [HECI][childProcess][manager] duk_get_prop_string(ctx, -1, ILibDuktape_ChildProcess_Manager); // [HECI][childProcess][manager]
session->mgr = (ILibProcessPipe_Manager)duk_get_pointer(ctx, -1); session->mgr = (ILibProcessPipe_Manager)duk_get_pointer(ctx, -1);
QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Session_Start, ILibProcessPipe_Manager_GetWorkerThread(session->mgr), (ULONG_PTR)session); ILibDuktape_HECI_Session_Start((ULONG_PTR)session);
#else #else
duk_push_this(ctx); // [HECI] duk_push_this(ctx); // [HECI]
session->descriptor = Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_HECI_Descriptor, -1); session->descriptor = Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_HECI_Descriptor, -1);
@@ -756,10 +754,10 @@ duk_ret_t ILibDuktape_HECI_Session_close(duk_context *ctx)
duk_get_prop_string(ctx, -1, ILibDuktape_HECI_SessionMemPtr); // [HECI][SESSION] duk_get_prop_string(ctx, -1, ILibDuktape_HECI_SessionMemPtr); // [HECI][SESSION]
session = (ILibDuktape_HECI_Session*)Duktape_GetBuffer(ctx, -1, NULL); session = (ILibDuktape_HECI_Session*)Duktape_GetBuffer(ctx, -1, NULL);
ILibProcessPipe_WaitHandle_Remove(session->mgr, session->v.hEvent); ILibChain_RemoveWaitHandle(session->chain, session->v.hEvent);
ILibProcessPipe_WaitHandle_Remove(session->mgr, session->wv.hEvent); ILibChain_RemoveWaitHandle(session->chain, session->wv.hEvent);
session->stream = NULL; session->stream = NULL;
QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Session_CloseSink2, ILibProcessPipe_Manager_GetWorkerThread(session->mgr), (ULONG_PTR)session->descriptor); CloseHandle(session->descriptor);
} }
#else #else
int d = Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_HECI_Descriptor, -1); int d = Duktape_GetIntPropertyValue(ctx, -1, ILibDuktape_HECI_Descriptor, -1);
@@ -851,7 +849,7 @@ void ILibDuktape_HECI_IoctlHandler_Dispatch(void *chain, void *user)
} }
#ifdef WIN32 #ifdef WIN32
void ILibDuktape_HECI_NextIoctl(ILibQueue q); void ILibDuktape_HECI_NextIoctl(ILibQueue q);
BOOL ILibDuktape_HECI_IoctlHandler(HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user) BOOL ILibDuktape_HECI_IoctlHandler(void * chain, HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user)
{ {
if (errors == ILibWaitHandle_ErrorStatus_INVALID_HANDLE) { return(FALSE); } if (errors == ILibWaitHandle_ErrorStatus_INVALID_HANDLE) { return(FALSE); }
if (!ILibMemory_CanaryOK(user)) { return(FALSE); } if (!ILibMemory_CanaryOK(user)) { return(FALSE); }
@@ -870,7 +868,7 @@ BOOL ILibDuktape_HECI_IoctlHandler(HANDLE h, ILibWaitHandle_ErrorStatus errors,
} }
ILibQueue_DeQueue(data->Q); ILibQueue_DeQueue(data->Q);
ILibProcessPipe_WaitHandle_Remove(data->pipeManager, h); ILibChain_RemoveWaitHandle(data->chain, h);
if (data->abort != 0 || !ILibMemory_CanaryOK(data->reserved)) if (data->abort != 0 || !ILibMemory_CanaryOK(data->reserved))
{ {
@@ -888,7 +886,7 @@ BOOL ILibDuktape_HECI_IoctlHandler(HANDLE h, ILibWaitHandle_ErrorStatus errors,
return(FALSE); return(FALSE);
} }
Duktape_RunOnEventLoop(data->chain, data->ctxnonce, data->ctx, ILibDuktape_HECI_IoctlHandler_Dispatch, NULL, data); ILibDuktape_HECI_IoctlHandler_Dispatch(data->chain, data);
if (ILibQueue_GetCount(Q) > 0) if (ILibQueue_GetCount(Q) > 0)
{ {
@@ -906,8 +904,7 @@ void ILibDuktape_HECI_NextIoctl(ILibQueue q)
ResetEvent(data->v.hEvent); ResetEvent(data->v.hEvent);
res = DeviceIoControl(data->device, (DWORD)data->code, data->buffer, (DWORD)data->bufferLen, data->outBuffer, (DWORD)data->outBufferLen, &(data->bytesReceived), &(data->v)); res = DeviceIoControl(data->device, (DWORD)data->code, data->buffer, (DWORD)data->bufferLen, data->outBuffer, (DWORD)data->outBufferLen, &(data->bytesReceived), &(data->v));
ILibProcessPipe_WaitHandle_Add_WithNonZeroTimeout(data->pipeManager, data->v.hEvent, 2000, data, ILibDuktape_HECI_IoctlHandler); ILibChain_AddWaitHandle(data->chain, data->v.hEvent, 2000, ILibDuktape_HECI_IoctlHandler, data);
} }
void __stdcall ILibDuktape_HECI_apc_AddIoctl(ULONG_PTR obj) void __stdcall ILibDuktape_HECI_apc_AddIoctl(ULONG_PTR obj)
{ {
@@ -1031,7 +1028,8 @@ duk_ret_t ILibDuktape_HECI_doIoctl(duk_context *ctx)
duk_get_prop_string(ctx, -2, ILibDuktape_HECI_ChildProcess); // [heci][stash][childProcess] duk_get_prop_string(ctx, -2, ILibDuktape_HECI_ChildProcess); // [heci][stash][childProcess]
duk_get_prop_string(ctx, -1, ILibDuktape_ChildProcess_Manager); // [heci][stash][childProcess][manager] duk_get_prop_string(ctx, -1, ILibDuktape_ChildProcess_Manager); // [heci][stash][childProcess][manager]
data->pipeManager = (ILibProcessPipe_Manager)duk_get_pointer(ctx, -1); data->pipeManager = (ILibProcessPipe_Manager)duk_get_pointer(ctx, -1);
QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_apc_AddIoctl, ILibProcessPipe_Manager_GetWorkerThread(data->pipeManager), (ULONG_PTR)data);
ILibDuktape_HECI_apc_AddIoctl((ULONG_PTR)data);
#elif defined(_POSIX) #elif defined(_POSIX)
ILibDuktape_HECI_AddIoctl(data); ILibDuktape_HECI_AddIoctl(data);
#endif #endif
@@ -1075,7 +1073,7 @@ duk_ret_t ILibDuktape_HECI_Finalizer(duk_context *ctx)
ILibQueue Q = (ILibQueue)Duktape_GetPointerProperty(ctx, 0, ILibDuktape_HECI_Q); ILibQueue Q = (ILibQueue)Duktape_GetPointerProperty(ctx, 0, ILibDuktape_HECI_Q);
duk_get_prop_string(ctx, 0, ILibDuktape_HECI_ChildProcess); duk_get_prop_string(ctx, 0, ILibDuktape_HECI_ChildProcess);
ILibProcessPipe_Manager mgr = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Manager); ILibProcessPipe_Manager mgr = (ILibProcessPipe_Manager)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Manager);
if (mgr != NULL) { QueueUserAPC((PAPCFUNC)ILibDuktape_HECI_Finalizer2, ILibProcessPipe_Manager_GetWorkerThread(mgr), (ULONG_PTR)Q); } ILibDuktape_HECI_Finalizer2((ULONG_PTR)Q);
#else #else
duk_get_prop_string(ctx, 0, ILibDuktape_HECI_Q); duk_get_prop_string(ctx, 0, ILibDuktape_HECI_Q);
ILibQueue_Destroy((ILibQueue)duk_get_pointer(ctx, -1)); ILibQueue_Destroy((ILibQueue)duk_get_pointer(ctx, -1));

23
microscript/ILibDuktape_fs.c
View File

@@ -922,7 +922,7 @@ duk_ret_t ILibDuktape_fs_watcher_close(duk_context *ctx)
#if defined(WIN32) #if defined(WIN32)
int r = CancelIo(data->h); int r = CancelIo(data->h);
ILibProcessPipe_WaitHandle_Remove(data->pipeManager, data->overlapped.hEvent); ILibChain_RemoveWaitHandle(data->chain, data->overlapped.hEvent);
CloseHandle(data->h); CloseHandle(data->h);
data->h = NULL; data->h = NULL;
#elif defined(_POSIX) && !defined(__APPLE__) && !defined(_FREEBSD) #elif defined(_POSIX) && !defined(__APPLE__) && !defined(_FREEBSD)
@@ -959,15 +959,14 @@ duk_ret_t ILibDuktape_fs_watcher_close(duk_context *ctx)
#endif #endif
#ifdef WIN32 #ifdef WIN32
BOOL ILibDuktape_fs_watch_iocompletion(HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user); BOOL ILibDuktape_fs_watch_iocompletion(void *chain, HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user)
void ILibDuktape_fs_watch_iocompletionEx(void *chain, void *user)
{ {
if (errors != ILibWaitHandle_ErrorStatus_NONE || !ILibMemory_CanaryOK(user)) { return(FALSE); }
ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)user; ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)user;
FILE_NOTIFY_INFORMATION *n = (FILE_NOTIFY_INFORMATION*)data->results; FILE_NOTIFY_INFORMATION *n = (FILE_NOTIFY_INFORMATION*)data->results;
char filename[4096]; char filename[4096];
int changed = 0, renamed = 0; int changed = 0, renamed = 0;
BOOL ret = FALSE;
duk_push_object(data->ctx); // [detail] duk_push_object(data->ctx); // [detail]
@@ -1040,18 +1039,10 @@ void ILibDuktape_fs_watch_iocompletionEx(void *chain, void *user)
} }
else else
{ {
ILibProcessPipe_WaitHandle_Add(data->pipeManager, data->overlapped.hEvent, data, ILibDuktape_fs_watch_iocompletion); ret = TRUE;
} }
} }
} return(ret);
BOOL ILibDuktape_fs_watch_iocompletion(HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user)
{
if (errors != ILibWaitHandle_ErrorStatus_NONE || !ILibMemory_CanaryOK(user)) { return(FALSE); }
ILibDuktape_fs_watcherData *data = (ILibDuktape_fs_watcherData*)user;
ILibProcessPipe_WaitHandle_Remove(data->pipeManager, h);
Duktape_RunOnEventLoop(data->chain, duk_ctx_nonce(data->ctx), data->ctx, ILibDuktape_fs_watch_iocompletionEx, NULL, data);
return(TRUE);
} }
#endif #endif
@@ -1414,7 +1405,7 @@ duk_ret_t ILibDuktape_fs_watch(duk_context *ctx)
{ {
return(ILibDuktape_Error(ctx, "fs.watch(): Error creating watcher")); return(ILibDuktape_Error(ctx, "fs.watch(): Error creating watcher"));
} }
ILibProcessPipe_WaitHandle_Add(pipeMgr, data->overlapped.hEvent, data, ILibDuktape_fs_watch_iocompletion); ILibChain_AddWaitHandle(data->chain, data->overlapped.hEvent, -1, ILibDuktape_fs_watch_iocompletion, data);
#elif defined(_POSIX) && !defined(__APPLE__) && !defined(_FREEBSD) #elif defined(_POSIX) && !defined(__APPLE__) && !defined(_FREEBSD)
data->wd.i = inotify_add_watch(data->linuxWatcher->fd, path, IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVED_FROM | IN_MOVED_TO); data->wd.i = inotify_add_watch(data->linuxWatcher->fd, path, IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVED_FROM | IN_MOVED_TO);
if (data->wd.i < 0) if (data->wd.i < 0)

10
microstack/ILibParsers.c
View File

@@ -2861,6 +2861,15 @@ void __stdcall ILibChain_RemoveWaitHandle_APC(ULONG_PTR u)
} }
} }
void ILibChain_RemoveWaitHandle(void *chain, HANDLE h) void ILibChain_RemoveWaitHandle(void *chain, HANDLE h)
{
if (ILibIsRunningOnChainThread(chain))
{
void *tmp[2];
tmp[0] = chain;
tmp[1] = h;
ILibChain_RemoveWaitHandle_APC((ULONG_PTR)tmp);
}
else
{ {
// //
// We must dispatch an APC to remove the wait handle, // We must dispatch an APC to remove the wait handle,
@@ -2871,6 +2880,7 @@ void ILibChain_RemoveWaitHandle(void *chain, HANDLE h)
tmp[1] = h; tmp[1] = h;
QueueUserAPC((PAPCFUNC)ILibChain_RemoveWaitHandle_APC, ILibChain_GetMicrostackThreadHandle(chain), (ULONG_PTR)tmp); QueueUserAPC((PAPCFUNC)ILibChain_RemoveWaitHandle_APC, ILibChain_GetMicrostackThreadHandle(chain), (ULONG_PTR)tmp);
} }
}
#endif #endif
/*! \fn ILibStartChain(void *Chain) /*! \fn ILibStartChain(void *Chain)