From b15f822fc8fb407ddb9a96bc4eec5bc7c8d7e854 Mon Sep 17 00:00:00 2001 From: esanchezm Date: Mon, 10 Jul 2006 10:43:11 +0000 Subject: [PATCH] 2006-07-10 Esteban Sanchez * modules/pandora_module_list.cc: Delete modules from the list in the destructor. * ssh/libssh2/*: Updated to a new version of libssh2 (v 0.14). It solves a very important leak. * PandoraAgent.dev: Linker options modified. Libssh2 files are not compiled as C++. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 11 ++ pandora_agents/win32/PandoraAgent.dev | 54 +++--- pandora_agents/win32/bin/PandoraAgent.exe | Bin 4596549 -> 5351993 bytes pandora_agents/win32/main.cc | 2 +- .../win32/modules/pandora_module_list.cc | 21 ++- .../win32/pandora_windows_service.h | 2 +- pandora_agents/win32/ssh/libssh2/channel.c | 47 +++--- pandora_agents/win32/ssh/libssh2/comp.c | 31 ++-- pandora_agents/win32/ssh/libssh2/crypt.c | 18 +- pandora_agents/win32/ssh/libssh2/hostkey.c | 41 +++-- pandora_agents/win32/ssh/libssh2/kex.c | 158 ++++++++++++------ pandora_agents/win32/ssh/libssh2/libssh2.h | 5 +- .../win32/ssh/libssh2/libssh2_config.h | 72 ++++---- .../win32/ssh/libssh2/libssh2_priv.h | 4 +- .../win32/ssh/libssh2/libssh2_publickey.h | 2 +- .../win32/ssh/libssh2/libssh2_sftp.h | 2 +- pandora_agents/win32/ssh/libssh2/mac.c | 6 +- pandora_agents/win32/ssh/libssh2/misc.c | 14 +- pandora_agents/win32/ssh/libssh2/packet.c | 120 ++++++++----- pandora_agents/win32/ssh/libssh2/publickey.c | 44 ++--- pandora_agents/win32/ssh/libssh2/scp.c | 50 +++--- pandora_agents/win32/ssh/libssh2/session.c | 77 +++++---- pandora_agents/win32/ssh/libssh2/sftp.c | 114 ++++++------- pandora_agents/win32/ssh/libssh2/userauth.c | 66 ++++---- 24 files changed, 549 insertions(+), 412 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 7193c624c8..d31714343d 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,14 @@ +2006-07-10 Esteban Sanchez + + * modules/pandora_module_list.cc: Delete modules from the list in the + destructor. + + * ssh/libssh2/*: Updated to a new version of libssh2 (v 0.14). It + solves a very important leak. + + * PandoraAgent.dev: Linker options modified. Libssh2 files are not + compiled as C++. + 2006-07-05 Sancho Lerena * INSTALL, COPYNG: Added to repository diff --git a/pandora_agents/win32/PandoraAgent.dev b/pandora_agents/win32/PandoraAgent.dev index de9b257385..bf5cb4b00f 100644 --- a/pandora_agents/win32/PandoraAgent.dev +++ b/pandora_agents/win32/PandoraAgent.dev @@ -12,7 +12,7 @@ ResourceIncludes= MakeIncludes= Compiler= CppCompiler= -Linker=-lole32_@@_-loleaut32_@@_-luuid_@@_-lpsapi_@@_-lwsock32_@@_-leay32_@@_-lz_@@_-liphlpapi_@@_-lnetapi32_@@_-lws2_32_@@_ +Linker=-lole32_@@_-loleaut32_@@_-luuid_@@_-lpsapi_@@_-lwsock32_@@_-lz_@@_-liphlpapi_@@_-lnetapi32_@@_-lws2_32_@@_-lcrypto_@@_-lgdi32_@@__@@_ IsCpp=1 Icon= ExeOutput= @@ -379,43 +379,43 @@ BuildCmd= [Unit34] FileName=ssh\libssh2\userauth.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c userauth.c -o userauth.o $(CFLAGS) [Unit35] FileName=ssh\libssh2\comp.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c comp.c -o comp.o $(CFLAGS) [Unit36] FileName=ssh\libssh2\crypt.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c crypt.c -o crypt.o $(CFLAGS) [Unit37] FileName=ssh\libssh2\kex.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c kex.c -o kex.o $(CFLAGS) [Unit38] FileName=ssh\libssh2\libssh2.h @@ -449,53 +449,53 @@ BuildCmd= [Unit41] FileName=ssh\libssh2\mac.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c mac.c -o mac.o $(CFLAGS) [Unit42] FileName=ssh\libssh2\packet.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c packet.c -o packet.o $(CFLAGS) [Unit43] FileName=ssh\libssh2\publickey.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c publickey.c -o publickey.o $(CFLAGS) [Unit44] FileName=ssh\libssh2\scp.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c scp.c -o scp.o $(CFLAGS) [Unit45] FileName=ssh\libssh2\session.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c session.c -o session.o $(CFLAGS) [Unit47] FileName=ssh\libssh2\libssh2_priv.h @@ -519,43 +519,43 @@ BuildCmd= [Unit49] FileName=ssh\libssh2\misc.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c misc.c -o misc.o $(CFLAGS) [Unit50] FileName=ssh\libssh2\sftp.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c sftp.c -o sftp.o $(CFLAGS) [Unit51] FileName=ssh\libssh2\channel.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c channel.c -o channel.o $(CFLAGS) [Unit46] FileName=ssh\libssh2\hostkey.c -CompileCpp=1 +CompileCpp=0 Folder=SSH/libssh2 Compile=1 Link=1 Priority=1000 OverrideBuildCmd=0 -BuildCmd= +BuildCmd=$(CC) -c hostkey.c -o hostkey.o $(CFLAGS) [Unit54] FileName=windows\pandora_windows_info.h diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index 854fe2883e1234d38d64a0453dc480f1e3302154..a2e480a23fe73a6cffba54a3876b87dbd82cd987 100755 GIT binary patch delta 1564100 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