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

Fixed bug, where websockets were added into globalAgent, instead of local agent.

Browse Source
This commit is contained in:
Bryan Roe
2021-02-02 17:15:11 -08:00
parent face65a52e
commit 4a42d731b0
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
microscript/ILibDuktape_HttpStream.c
View File

@@ -1052,23 +1052,16 @@ duk_ret_t ILibDuktape_HttpStream_http_OnConnect(duk_context *ctx)
}
else
{
// Add socket to agent.Sockets
char *key = (char*)Duktape_GetStringPropertyValue(ctx, -1, ILibDuktape_Socket2AgentKey, NULL);
duk_get_prop_string(ctx, -1, ILibDuktape_Socket2Agent); // [socket][agent]
duk_get_prop_string(ctx, -1, "http"); // [socket][agent][http]
duk_get_prop_string(ctx, -1, "globalAgent"); // [socket][agent][http][globalAgent]
if (duk_get_heapptr(ctx, -1) != duk_get_heapptr(ctx, -3))
{
// This agent is not a global agent, so lets stick the socket in the sockets list
char *key = (char*)Duktape_GetStringPropertyValue(ctx, -4, ILibDuktape_Socket2AgentKey, NULL);
duk_get_prop_string(ctx, -1, "sockets"); // [socket][agent][http][globalAgent][table]
if (!duk_has_prop_string(ctx, -1, key)) { duk_push_array(ctx); duk_put_prop_string(ctx, -2, key); }
duk_get_prop_string(ctx, -1, key); // [socket][agent][http][globalAgent][table][array]
duk_dup(ctx, -6); // [socket][agent][http][globalAgent][table][array][socket]
duk_array_push(ctx, -2); // [socket][agent][http][globalAgent][table][array]
duk_pop_2(ctx); // [socket][agent][http][globalAgent]
}
duk_get_prop_string(ctx, -1, "sockets"); // [socket][agent][table]
if (!duk_has_prop_string(ctx, -1, key)) { duk_push_array(ctx); duk_put_prop_string(ctx, -2, key); }
duk_get_prop_string(ctx, -1, key); // [socket][agent][table][array]
duk_dup(ctx, -4); // [socket][agent][table][array][socket]
duk_array_push(ctx, -2); // [socket][agent][table][array]
duk_pop_2(ctx); // [socket][agent]
duk_get_prop_string(ctx, -1, "keepSocketAlive"); // [socket][agent][keepSocketAlive]
duk_swap_top(ctx, -2); // [socket][keepSocketAlive][this]
duk_dup(ctx, -3); // [socket][keepSocketAlive][this][socket]