github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix assist memory leak. installer script works with NSIS 3.0.1.

pull/32/merge
Apex Liu 2017-03-10 14:22:04 +08:00
parent 858b24f5c1
commit b90d24e42d
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/builder/core/env.py
View File

@ -199,6 +199,8 @@ class Env(object):
def _get_nsis(self): def _get_nsis(self):
p = self._winreg_read(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\NSIS\Unicode', '') p = self._winreg_read(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\NSIS\Unicode', '')
if p is None:
p = self._winreg_read(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\NSIS', '')
return os.path.join(p[0], 'makensis.exe') if p is not None else None return os.path.join(p[0], 'makensis.exe') if p is not None else None
def _winreg_read(self, base, path, key): def _winreg_read(self, base, path, key):

5
client/tp_assist/tp_assist.cpp
View File

@ -4,6 +4,11 @@
#include "resource.h" #include "resource.h"
#include "dlg_main.h" #include "dlg_main.h"
#include "ts_http_rpc.h" #include "ts_http_rpc.h"
#ifdef _DEBUG
# include <vld.h>
#endif
#pragma comment(lib, "shlwapi.lib") #pragma comment(lib, "shlwapi.lib")
#define WMU_INSTANCE_EXIT (WM_USER + 2) #define WMU_INSTANCE_EXIT (WM_USER + 2)

2
client/tp_assist/tp_assist.vs2015.vcxproj
View File

@ -46,6 +46,8 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>..\..\out\client\$(PlatformTarget)\$(Configuration)\</OutDir> <OutDir>..\..\out\client\$(PlatformTarget)\$(Configuration)\</OutDir>
<IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir> <IntDir>..\..\out\_tmp_\$(ProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir>
<IncludePath>D:\apps\vld\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\apps\vld\lib\Win32;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>

6
client/tp_assist/ts_http_rpc.cpp
View File

@ -105,7 +105,7 @@ void http_rpc_main_loop(void)
g_http_interface.run(); g_http_interface.run();
EXLOGW("[prc] main loop end.\n"); EXLOGW("[rpc] main loop end.\n");
} }
void http_rpc_stop(void) void http_rpc_stop(void)
@ -188,7 +188,6 @@ bool TsHttpRpc::init(const char* ip, int port)
else else
sprintf_s(addr, 128, "%s:%d", ip, port); sprintf_s(addr, 128, "%s:%d", ip, port);
mg_mgr_init(&m_mg_mgr, NULL);
nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler); nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler);
if (nc == NULL) if (nc == NULL)
{ {
@ -250,7 +249,7 @@ void TsHttpRpc::_mg_event_handler(struct mg_connection *nc, int ev, void *ev_dat
memcpy(&_uri[0], hm->uri.p, hm->uri.len); memcpy(&_uri[0], hm->uri.p, hm->uri.len);
uri = &_uri[0]; uri = &_uri[0];
#ifdef TS_DEBUG #ifdef EX_DEBUG
char* dbg_method = NULL; char* dbg_method = NULL;
if (hm->method.len == 3 && 0 == memcmp(hm->method.p, "GET", hm->method.len)) if (hm->method.len == 3 && 0 == memcmp(hm->method.p, "GET", hm->method.len))
dbg_method = "GET"; dbg_method = "GET";
@ -319,6 +318,7 @@ void TsHttpRpc::_mg_event_handler(struct mg_connection *nc, int ev, void *ev_dat
mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %d\r\nContent-Type: %s\r\n\r\n", file_size, content_type.c_str()); mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %d\r\nContent-Type: %s\r\n\r\n", file_size, content_type.c_str());
mg_send(nc, buf, file_size); mg_send(nc, buf, file_size);
delete []buf;
nc->flags |= MG_F_SEND_AND_CLOSE; nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }