diff --git a/ChangeLog b/ChangeLog index 10d09aa2f755d7c377780ddff6c8b7558520d766..a8a63044e3207b3122f0595fd5b5adfc87fd5095 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1 @@ -2023-03-05 ahttp 集成asynframe-sdk_v1.4.1-20230305 https://github.com/netsecsp/asynframe +2023-03-08 ahttp 集成asynframe-sdk_v1.4.2-20230308 https://github.com/netsecsp/asynframe diff --git a/README.md b/README.md index 628d8de3ec4b88a509d08f74b22738cc94df0e1e..78753c701f2d978cd741be175e52588b724f526d 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -> asynframe-sdk_v1.4.1-202300305.zip is from https://github.com/netsecsp/asynframe +> asynframe-sdk_v1.4.2-20230308.zip is from https://github.com/netsecsp/asynframe # ahttpclient.exe > supports IPv4/IPv6 http/https client program under windows diff --git a/client/3rd/bin/asyncore.dll b/client/3rd/bin/asyncore.dll index a104ecc00da96cc8e58a84653ad79638a022d4ba..81cb928af77b85264424a33c67d16988420d8683 100755 Binary files a/client/3rd/bin/asyncore.dll and b/client/3rd/bin/asyncore.dll differ diff --git a/client/3rd/bin/asynfile.dll b/client/3rd/bin/asynfile.dll index 10c48e0e17a1e829d4d6dbb3f5fb3d71edec472d..138fcd55480be4e0226be5fd85f0f9d26bc52052 100755 Binary files a/client/3rd/bin/asynfile.dll and b/client/3rd/bin/asynfile.dll differ diff --git a/client/3rd/bin/asynipcs.dll b/client/3rd/bin/asynipcs.dll index 8bf8c42a9b53ae6fb6c6f0a59a7f421798dd914c..6de4f4332371c7c366aa0c227d8cf318f57bbb11 100755 Binary files a/client/3rd/bin/asynipcs.dll and b/client/3rd/bin/asynipcs.dll differ diff --git a/client/3rd/bin/asynneta.dll b/client/3rd/bin/asynneta.dll index bb9afcc599e5cbb1d5373504ddbee15826bcdbeb..f534d71459b0ec3c382b4df32f9cf24a51da77f8 100755 Binary files a/client/3rd/bin/asynneta.dll and b/client/3rd/bin/asynneta.dll differ diff --git a/client/3rd/bin/asynsock.dll b/client/3rd/bin/asynsock.dll index 3da8777d34adc2353c40453c36ff96195d5ef5d2..084075761f1b5311d57c562f50d0d7dfc8d9f400 100755 Binary files a/client/3rd/bin/asynsock.dll and b/client/3rd/bin/asynsock.dll differ diff --git a/client/3rd/bin/console.dll b/client/3rd/bin/console.dll index 67476a6cc41d4d8447555d28be069f87f66046b2..5f927e1659602cd1bb7255ae409987be6fa9551a 100755 Binary files a/client/3rd/bin/console.dll and b/client/3rd/bin/console.dll differ diff --git a/client/3rd/bin/crashexplorer.dll b/client/3rd/bin/crashexplorer.dll index 807dbc719ed7eba863cdc410639e048cbe206705..06a4c6d96dd76a0ab2a916fc17c96b527980541d 100755 Binary files a/client/3rd/bin/crashexplorer.dll and b/client/3rd/bin/crashexplorer.dll differ diff --git a/client/3rd/bin/dns.dll b/client/3rd/bin/dns.dll index 8fa0cbe1a655411a69d91fc8920e5c47215de8c2..365db20c4e59b14360ffe28fabb4a463800ce738 100755 Binary files a/client/3rd/bin/dns.dll and b/client/3rd/bin/dns.dll differ diff --git a/client/3rd/bin/dtp.dll b/client/3rd/bin/dtp.dll index 25b6f5472b7a0d7b1a5d95143926341333a4e1f8..060d1edf410d796490c250dca21389c6214fe607 100755 Binary files a/client/3rd/bin/dtp.dll and b/client/3rd/bin/dtp.dll differ diff --git a/client/3rd/bin/ftp.dll b/client/3rd/bin/ftp.dll index fbf836d33cb18825ed4a55b530e171df5f7ef036..e5037986dbb3284aa96a886cc78a7eb30aa2c3f3 100755 Binary files a/client/3rd/bin/ftp.dll and b/client/3rd/bin/ftp.dll differ diff --git a/client/3rd/bin/http.dll b/client/3rd/bin/http.dll index 0a1715974a23ac9c685f3dc2dc84fbddad6d7101..a96139d3f681491450f59772a30fbaff329a8f39 100755 Binary files a/client/3rd/bin/http.dll and b/client/3rd/bin/http.dll differ diff --git a/client/3rd/bin/lua.dll b/client/3rd/bin/lua.dll index 27f9dcc28f9f077538b9b3caac7b91b54afde762..50df4ecb33d0f8b92106a89b044090aaee11f1f6 100755 Binary files a/client/3rd/bin/lua.dll and b/client/3rd/bin/lua.dll differ diff --git a/client/3rd/bin/prop.txt b/client/3rd/bin/prop.txt index bcb2c74a9fce413279284d5f8c3cb1fd6e0a502d..86e46a854085500cdb23b576b2a447819164a965 100755 --- a/client/3rd/bin/prop.txt +++ b/client/3rd/bin/prop.txt @@ -1,4 +1,4 @@ -log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE +log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE ####################################################################### # STDOUT # @@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5 # ROLLING_LOG_FILE # ####################################################################### log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender -log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log +log4cplus.appender.ROLLING_LOG_FILE.File=prop.log log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5 # Truncate 'test' if it aleady exists. diff --git a/client/3rd/bin/proxy.dll b/client/3rd/bin/proxy.dll index f1f41e9731d5efe7ca7b7dab7afbbdd7647c94d0..110beb3993d5a5be26c045861c0f35745729ea17 100755 Binary files a/client/3rd/bin/proxy.dll and b/client/3rd/bin/proxy.dll differ diff --git a/client/3rd/bin/ras.dll b/client/3rd/bin/ras.dll index 71f3d088cd598c5edbc2febf42ed47a148f6c85b..b1b525f589be47737e1686172c97036130fd0a92 100755 Binary files a/client/3rd/bin/ras.dll and b/client/3rd/bin/ras.dll differ diff --git a/client/3rd/bin/rtsp.dll b/client/3rd/bin/rtsp.dll index 6f651c6ee83f1e9882892f7d475ca3f1adfb1b44..4492677f3c27aefd41bef7e9b2c052887470e720 100755 Binary files a/client/3rd/bin/rtsp.dll and b/client/3rd/bin/rtsp.dll differ diff --git a/client/3rd/bin/sqlite.dll b/client/3rd/bin/sqlite.dll index 5b803ef911efc4824dccee512037d1457f8b54fa..b2a75a23f4c4455581070e83a02216700e4d7e2b 100755 Binary files a/client/3rd/bin/sqlite.dll and b/client/3rd/bin/sqlite.dll differ diff --git a/client/3rd/bin/ssl.dll b/client/3rd/bin/ssl.dll index 035239d8791f2c9427b89e2c7ebabc879656e317..ce4ba2cfd738ce1a7e787cc9d0df32ab9c2d76d7 100755 Binary files a/client/3rd/bin/ssl.dll and b/client/3rd/bin/ssl.dll differ diff --git a/client/3rd/bin/websocket.dll b/client/3rd/bin/websocket.dll index 31ad0947529e225a9820f08d7c6cc14253cc1582..05cddea23db0223f14edc8ba1cf630a2be91dc8e 100755 Binary files a/client/3rd/bin/websocket.dll and b/client/3rd/bin/websocket.dll differ diff --git a/client/3rd/bin/x64/asyncore.dll b/client/3rd/bin/x64/asyncore.dll index bf33a60adad557606378491be2614183c6f85c8d..85f396ba0f9a97ee4226b8c7b6d955bb03e9ee94 100755 Binary files a/client/3rd/bin/x64/asyncore.dll and b/client/3rd/bin/x64/asyncore.dll differ diff --git a/client/3rd/bin/x64/asynfile.dll b/client/3rd/bin/x64/asynfile.dll index 1f8247085cb1595245dc3a1a7778375dee21cd47..e9659cee4bac5f2d30c69c5dc82d8abe723890a6 100755 Binary files a/client/3rd/bin/x64/asynfile.dll and b/client/3rd/bin/x64/asynfile.dll differ diff --git a/client/3rd/bin/x64/asynipcs.dll b/client/3rd/bin/x64/asynipcs.dll index 6d1bf3259e0758c8a24fbe87a35f7da5baf6cc96..4296bb32b96fde8ed4f71f425500d2cd740e8a60 100755 Binary files a/client/3rd/bin/x64/asynipcs.dll and b/client/3rd/bin/x64/asynipcs.dll differ diff --git a/client/3rd/bin/x64/asynneta.dll b/client/3rd/bin/x64/asynneta.dll index 7856d621df1899d504a8c78534f42a55a22aef3d..dce1ebac57eb52cabb9c2d91b5d596f0d33b3fc2 100755 Binary files a/client/3rd/bin/x64/asynneta.dll and b/client/3rd/bin/x64/asynneta.dll differ diff --git a/client/3rd/bin/x64/asynsock.dll b/client/3rd/bin/x64/asynsock.dll index c8beda967ba9c5b047600bf38d2721b35bbfc6a9..29e2ac2f28c40cdfad4c204b92be4ee9ecf6ef89 100755 Binary files a/client/3rd/bin/x64/asynsock.dll and b/client/3rd/bin/x64/asynsock.dll differ diff --git a/client/3rd/bin/x64/console.dll b/client/3rd/bin/x64/console.dll index a6048c3f753e6ccbca6ba4db7394a87c0128d1b1..269c7081f8d4da5e2a7561368251c1555e21fe06 100755 Binary files a/client/3rd/bin/x64/console.dll and b/client/3rd/bin/x64/console.dll differ diff --git a/client/3rd/bin/x64/crashexplorer.dll b/client/3rd/bin/x64/crashexplorer.dll index 0623781dec29fc7c631387308b1b28302477f214..280968bf779e2f51d97c9a2e686338afb998420e 100755 Binary files a/client/3rd/bin/x64/crashexplorer.dll and b/client/3rd/bin/x64/crashexplorer.dll differ diff --git a/client/3rd/bin/x64/dns.dll b/client/3rd/bin/x64/dns.dll index 3d0a62b9d3e672c907d0c081998fceb5cb5919e8..7dd1ac8ade3173d9ddf6a651112eecf65e020dd6 100755 Binary files a/client/3rd/bin/x64/dns.dll and b/client/3rd/bin/x64/dns.dll differ diff --git a/client/3rd/bin/x64/dtp.dll b/client/3rd/bin/x64/dtp.dll index d0253b4dc538fc9fe971edd3a28c6376c0557de4..3b3e9cf2125fd814ca0f931f78a53c42b2b4e43f 100755 Binary files a/client/3rd/bin/x64/dtp.dll and b/client/3rd/bin/x64/dtp.dll differ diff --git a/client/3rd/bin/x64/ftp.dll b/client/3rd/bin/x64/ftp.dll index d459fb9ee9f081a991953f31f3bfed6202cf5d91..08bcf694ea2654a8dbd897555e5b335c6e15ae5a 100755 Binary files a/client/3rd/bin/x64/ftp.dll and b/client/3rd/bin/x64/ftp.dll differ diff --git a/client/3rd/bin/x64/http.dll b/client/3rd/bin/x64/http.dll index b052eb36604f5d1c8a7217348ee22aa19c1f2d61..ffbe5c5cf5d68b7d74ac0679ed2ca4c57d2ab00a 100755 Binary files a/client/3rd/bin/x64/http.dll and b/client/3rd/bin/x64/http.dll differ diff --git a/client/3rd/bin/x64/lua.dll b/client/3rd/bin/x64/lua.dll index c8bd96cc1f652678f6af20042c12318712743a01..227dc81c0ba33c1a86f14e31bc4658529f17ae86 100755 Binary files a/client/3rd/bin/x64/lua.dll and b/client/3rd/bin/x64/lua.dll differ diff --git a/client/3rd/bin/x64/prop.txt b/client/3rd/bin/x64/prop.txt index bcb2c74a9fce413279284d5f8c3cb1fd6e0a502d..86e46a854085500cdb23b576b2a447819164a965 100755 --- a/client/3rd/bin/x64/prop.txt +++ b/client/3rd/bin/x64/prop.txt @@ -1,4 +1,4 @@ -log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE +log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE ####################################################################### # STDOUT # @@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5 # ROLLING_LOG_FILE # ####################################################################### log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender -log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log +log4cplus.appender.ROLLING_LOG_FILE.File=prop.log log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5 # Truncate 'test' if it aleady exists. diff --git a/client/3rd/bin/x64/proxy.dll b/client/3rd/bin/x64/proxy.dll index a4968aeca388ec265fcf64a3c03b343fb9548cd1..4b0d61156e58f6e2109d9217ccf25143ceec6b60 100755 Binary files a/client/3rd/bin/x64/proxy.dll and b/client/3rd/bin/x64/proxy.dll differ diff --git a/client/3rd/bin/x64/ras.dll b/client/3rd/bin/x64/ras.dll index fda872d3b404f6430d47df0b1a7288ce9729684e..73189232ddf74291a31060df336480d43f74ee4f 100755 Binary files a/client/3rd/bin/x64/ras.dll and b/client/3rd/bin/x64/ras.dll differ diff --git a/client/3rd/bin/x64/rtsp.dll b/client/3rd/bin/x64/rtsp.dll index 92bbf04232844a69f640980c7b8cd044313a7067..7d3403d0fed2afcdec00011759e58814d2882b99 100755 Binary files a/client/3rd/bin/x64/rtsp.dll and b/client/3rd/bin/x64/rtsp.dll differ diff --git a/client/3rd/bin/x64/sqlite.dll b/client/3rd/bin/x64/sqlite.dll index 9dbcc439a3429823b4fa57a62a2e63d9f870be60..b1acbd6e8c880726f07335ebe2a1f150880e1e97 100755 Binary files a/client/3rd/bin/x64/sqlite.dll and b/client/3rd/bin/x64/sqlite.dll differ diff --git a/client/3rd/bin/x64/ssl.dll b/client/3rd/bin/x64/ssl.dll index 26fa60b91a867c7e731cd37a2188596d4f2d137a..5bfac9e0c74b5fe0be200c0bae9d15332d02dca9 100755 Binary files a/client/3rd/bin/x64/ssl.dll and b/client/3rd/bin/x64/ssl.dll differ diff --git a/client/3rd/bin/x64/websocket.dll b/client/3rd/bin/x64/websocket.dll index 0486a562e77b14e912d09ee8d543aa31625dee78..7610b830c579bbfc6014e142bac9678e09d45e16 100755 Binary files a/client/3rd/bin/x64/websocket.dll and b/client/3rd/bin/x64/websocket.dll differ diff --git a/client/3rd/bin/x64/zip.dll b/client/3rd/bin/x64/zip.dll index 9b2ac08022c722736de1b4e8ca0f19fe7800c949..804a3cf4253d63357f0dfb5890ffca3c56db8602 100755 Binary files a/client/3rd/bin/x64/zip.dll and b/client/3rd/bin/x64/zip.dll differ diff --git a/client/3rd/bin/zip.dll b/client/3rd/bin/zip.dll index 96e33bba32d461c15f523821c18086d8d45646cd..1c48bea4f8f182df1dd559c24bce89427416bab4 100755 Binary files a/client/3rd/bin/zip.dll and b/client/3rd/bin/zip.dll differ diff --git a/client/3rd/include/frame/AsynCore_internal.h b/client/3rd/include/frame/AsynCore_internal.h index 68dfeba037c993d9f29e480bdfe4d7d912004a79..916c13f8da73255778152adcf710754cf7fb38f6 100755 --- a/client/3rd/include/frame/AsynCore_internal.h +++ b/client/3rd/include/frame/AsynCore_internal.h @@ -113,6 +113,8 @@ END_ASYN_IOERROR() #define Io_connect ( 17) #define Io_bind ( 18) #define Io_hostdns ( 19) +#define Io_allocsize ( 20) +#define Io_flushfile ( 21) ///////////////////////////////////////////////////////////////////////////////// //ISpeedController.IObjectHolder(lType) diff --git a/client/3rd/include/frame/Console.h b/client/3rd/include/frame/Console.h index 1398d956aaef64a733d35776b152c5d291654416..b481bebbefb9853750a704afc8868ae6e2a8677b 100755 --- a/client/3rd/include/frame/Console.h +++ b/client/3rd/include/frame/Console.h @@ -43,6 +43,10 @@ NAMESPACE_BEGIN(asynsdk) //IConsole(InstanceName) #define IN_Console "com.asynframe.console" +///////////////////////////////////////////////////////////////////////////////// +#define ENABLE_INPUT_KEYBOARD 0x1 +#define ENABLE_INPUT_MOUSE 0x2 + NAMESPACE_END(asynsdk) #endif // !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_) \ No newline at end of file diff --git a/client/3rd/include/frame/app/AsynMessageEvents.h b/client/3rd/include/frame/app/AsynMessageEvents.h index 0433d736607b0f5f7108b508e82eea5bfc8bbc4b..642989b5004e3cd080ebe9c467e2487d79e51b8b 100755 --- a/client/3rd/include/frame/app/AsynMessageEvents.h +++ b/client/3rd/include/frame/app/AsynMessageEvents.h @@ -57,7 +57,7 @@ public: // COM_INTERFACE_ENTRY(IAsynMessageEvents) // END_COM_MAP() BEGIN_OBJ_MAP(CAsynMessageEvents_base) - OBJ_INTERFACE_ENTRY(IAsynMessageEvents) + OBJ_INTERFACE_ENTRY(IAsynMessageEvents) END_OBJ_MAP() public: //interface of IAsynMessageEvents diff --git a/client/3rd/lib/asynsdk_mini-MD.lib b/client/3rd/lib/asynsdk_mini-MD.lib index 07176587f4d8b54c93394695a75d2133bc472516..fc4b7a07139a6d8fc6911d31b48a63c66475d9ef 100755 Binary files a/client/3rd/lib/asynsdk_mini-MD.lib and b/client/3rd/lib/asynsdk_mini-MD.lib differ diff --git a/client/3rd/lib/asynsdk_mini-MDd.lib b/client/3rd/lib/asynsdk_mini-MDd.lib index 6a1011ba4a3ee0baf13ce2eaf412046016ec5a40..b1e6008140c0e15b3e6a0f4425919434c63bad69 100755 Binary files a/client/3rd/lib/asynsdk_mini-MDd.lib and b/client/3rd/lib/asynsdk_mini-MDd.lib differ diff --git a/client/3rd/lib/asynsdk_mini-MT.lib b/client/3rd/lib/asynsdk_mini-MT.lib index e54da558d6d51409eab1e5307a48e4cd2a338912..604d12f1db72016e185414d406f68bf5bc32c6e0 100755 Binary files a/client/3rd/lib/asynsdk_mini-MT.lib and b/client/3rd/lib/asynsdk_mini-MT.lib differ diff --git a/client/3rd/lib/asynsdk_mini-MTd.lib b/client/3rd/lib/asynsdk_mini-MTd.lib index 8f7d6c9939611484fb1eba71622f518d645ac640..5d59bd36bbc4458711ee29c0a8886484b8acc246 100755 Binary files a/client/3rd/lib/asynsdk_mini-MTd.lib and b/client/3rd/lib/asynsdk_mini-MTd.lib differ diff --git a/client/3rd/lib/x64/asynsdk_mini-MD.lib b/client/3rd/lib/x64/asynsdk_mini-MD.lib index 94350e57136a21c2a678c2aa75d3a67b35a919ec..6c52cd2369aa6c6759569a5ad0a65f3c371c14c5 100755 Binary files a/client/3rd/lib/x64/asynsdk_mini-MD.lib and b/client/3rd/lib/x64/asynsdk_mini-MD.lib differ diff --git a/client/3rd/lib/x64/asynsdk_mini-MDd.lib b/client/3rd/lib/x64/asynsdk_mini-MDd.lib index 8ffc28dad6bcc4788ca8e9631719c033323e24f4..058334b365e22c09cc7fa95f767f95a52e90b073 100755 Binary files a/client/3rd/lib/x64/asynsdk_mini-MDd.lib and b/client/3rd/lib/x64/asynsdk_mini-MDd.lib differ diff --git a/client/3rd/lib/x64/asynsdk_mini-MT.lib b/client/3rd/lib/x64/asynsdk_mini-MT.lib index 5dd35e2910500f9015028e8374e1375e752b0616..c85a4149331c9a39dc54b6b808625818bf12ec4d 100755 Binary files a/client/3rd/lib/x64/asynsdk_mini-MT.lib and b/client/3rd/lib/x64/asynsdk_mini-MT.lib differ diff --git a/client/3rd/lib/x64/asynsdk_mini-MTd.lib b/client/3rd/lib/x64/asynsdk_mini-MTd.lib index e9fdedfbd65d7a82a057806b13cc4938e8ad5ee0..cdf3ce9916473657363478debecdf042aad1479c 100755 Binary files a/client/3rd/lib/x64/asynsdk_mini-MTd.lib and b/client/3rd/lib/x64/asynsdk_mini-MTd.lib differ diff --git a/client/bin/ahttpclient-x64.exe b/client/bin/ahttpclient-x64.exe index 25a75c7a11ff8edfc0ccc70da835110fc7aab56a..62635eff8b1d0dd708dfcff39e5cdf08554d412c 100755 Binary files a/client/bin/ahttpclient-x64.exe and b/client/bin/ahttpclient-x64.exe differ diff --git a/client/bin/ahttpclient.exe b/client/bin/ahttpclient.exe index 6cc9b49340464393fc328575cba95280c40ae47b..8dbfbe80f4f96925b7baf5497e20658175948abb 100755 Binary files a/client/bin/ahttpclient.exe and b/client/bin/ahttpclient.exe differ diff --git a/server/3rd/bin/asyncore.dll b/server/3rd/bin/asyncore.dll index a104ecc00da96cc8e58a84653ad79638a022d4ba..81cb928af77b85264424a33c67d16988420d8683 100755 Binary files a/server/3rd/bin/asyncore.dll and b/server/3rd/bin/asyncore.dll differ diff --git a/server/3rd/bin/asynfile.dll b/server/3rd/bin/asynfile.dll index 10c48e0e17a1e829d4d6dbb3f5fb3d71edec472d..138fcd55480be4e0226be5fd85f0f9d26bc52052 100755 Binary files a/server/3rd/bin/asynfile.dll and b/server/3rd/bin/asynfile.dll differ diff --git a/server/3rd/bin/asynipcs.dll b/server/3rd/bin/asynipcs.dll index 8bf8c42a9b53ae6fb6c6f0a59a7f421798dd914c..6de4f4332371c7c366aa0c227d8cf318f57bbb11 100755 Binary files a/server/3rd/bin/asynipcs.dll and b/server/3rd/bin/asynipcs.dll differ diff --git a/server/3rd/bin/asynneta.dll b/server/3rd/bin/asynneta.dll index bb9afcc599e5cbb1d5373504ddbee15826bcdbeb..f534d71459b0ec3c382b4df32f9cf24a51da77f8 100755 Binary files a/server/3rd/bin/asynneta.dll and b/server/3rd/bin/asynneta.dll differ diff --git a/server/3rd/bin/asynsock.dll b/server/3rd/bin/asynsock.dll index 3da8777d34adc2353c40453c36ff96195d5ef5d2..084075761f1b5311d57c562f50d0d7dfc8d9f400 100755 Binary files a/server/3rd/bin/asynsock.dll and b/server/3rd/bin/asynsock.dll differ diff --git a/server/3rd/bin/console.dll b/server/3rd/bin/console.dll index 67476a6cc41d4d8447555d28be069f87f66046b2..5f927e1659602cd1bb7255ae409987be6fa9551a 100755 Binary files a/server/3rd/bin/console.dll and b/server/3rd/bin/console.dll differ diff --git a/server/3rd/bin/crashexplorer.dll b/server/3rd/bin/crashexplorer.dll index 807dbc719ed7eba863cdc410639e048cbe206705..06a4c6d96dd76a0ab2a916fc17c96b527980541d 100755 Binary files a/server/3rd/bin/crashexplorer.dll and b/server/3rd/bin/crashexplorer.dll differ diff --git a/server/3rd/bin/dns.dll b/server/3rd/bin/dns.dll index 8fa0cbe1a655411a69d91fc8920e5c47215de8c2..365db20c4e59b14360ffe28fabb4a463800ce738 100755 Binary files a/server/3rd/bin/dns.dll and b/server/3rd/bin/dns.dll differ diff --git a/server/3rd/bin/dtp.dll b/server/3rd/bin/dtp.dll index 25b6f5472b7a0d7b1a5d95143926341333a4e1f8..060d1edf410d796490c250dca21389c6214fe607 100755 Binary files a/server/3rd/bin/dtp.dll and b/server/3rd/bin/dtp.dll differ diff --git a/server/3rd/bin/ftp.dll b/server/3rd/bin/ftp.dll index fbf836d33cb18825ed4a55b530e171df5f7ef036..e5037986dbb3284aa96a886cc78a7eb30aa2c3f3 100755 Binary files a/server/3rd/bin/ftp.dll and b/server/3rd/bin/ftp.dll differ diff --git a/server/3rd/bin/http.dll b/server/3rd/bin/http.dll index 0a1715974a23ac9c685f3dc2dc84fbddad6d7101..a96139d3f681491450f59772a30fbaff329a8f39 100755 Binary files a/server/3rd/bin/http.dll and b/server/3rd/bin/http.dll differ diff --git a/server/3rd/bin/lua.dll b/server/3rd/bin/lua.dll index 27f9dcc28f9f077538b9b3caac7b91b54afde762..50df4ecb33d0f8b92106a89b044090aaee11f1f6 100755 Binary files a/server/3rd/bin/lua.dll and b/server/3rd/bin/lua.dll differ diff --git a/server/3rd/bin/prop.txt b/server/3rd/bin/prop.txt index bcb2c74a9fce413279284d5f8c3cb1fd6e0a502d..86e46a854085500cdb23b576b2a447819164a965 100755 --- a/server/3rd/bin/prop.txt +++ b/server/3rd/bin/prop.txt @@ -1,4 +1,4 @@ -log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE +log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE ####################################################################### # STDOUT # @@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5 # ROLLING_LOG_FILE # ####################################################################### log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender -log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log +log4cplus.appender.ROLLING_LOG_FILE.File=prop.log log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5 # Truncate 'test' if it aleady exists. diff --git a/server/3rd/bin/proxy.dll b/server/3rd/bin/proxy.dll index f1f41e9731d5efe7ca7b7dab7afbbdd7647c94d0..110beb3993d5a5be26c045861c0f35745729ea17 100755 Binary files a/server/3rd/bin/proxy.dll and b/server/3rd/bin/proxy.dll differ diff --git a/server/3rd/bin/ras.dll b/server/3rd/bin/ras.dll index 71f3d088cd598c5edbc2febf42ed47a148f6c85b..b1b525f589be47737e1686172c97036130fd0a92 100755 Binary files a/server/3rd/bin/ras.dll and b/server/3rd/bin/ras.dll differ diff --git a/server/3rd/bin/rtsp.dll b/server/3rd/bin/rtsp.dll index 6f651c6ee83f1e9882892f7d475ca3f1adfb1b44..4492677f3c27aefd41bef7e9b2c052887470e720 100755 Binary files a/server/3rd/bin/rtsp.dll and b/server/3rd/bin/rtsp.dll differ diff --git a/server/3rd/bin/sqlite.dll b/server/3rd/bin/sqlite.dll index 5b803ef911efc4824dccee512037d1457f8b54fa..b2a75a23f4c4455581070e83a02216700e4d7e2b 100755 Binary files a/server/3rd/bin/sqlite.dll and b/server/3rd/bin/sqlite.dll differ diff --git a/server/3rd/bin/ssl.dll b/server/3rd/bin/ssl.dll index 035239d8791f2c9427b89e2c7ebabc879656e317..ce4ba2cfd738ce1a7e787cc9d0df32ab9c2d76d7 100755 Binary files a/server/3rd/bin/ssl.dll and b/server/3rd/bin/ssl.dll differ diff --git a/server/3rd/bin/websocket.dll b/server/3rd/bin/websocket.dll index 31ad0947529e225a9820f08d7c6cc14253cc1582..05cddea23db0223f14edc8ba1cf630a2be91dc8e 100755 Binary files a/server/3rd/bin/websocket.dll and b/server/3rd/bin/websocket.dll differ diff --git a/server/3rd/bin/x64/asyncore.dll b/server/3rd/bin/x64/asyncore.dll index bf33a60adad557606378491be2614183c6f85c8d..85f396ba0f9a97ee4226b8c7b6d955bb03e9ee94 100755 Binary files a/server/3rd/bin/x64/asyncore.dll and b/server/3rd/bin/x64/asyncore.dll differ diff --git a/server/3rd/bin/x64/asynfile.dll b/server/3rd/bin/x64/asynfile.dll index 1f8247085cb1595245dc3a1a7778375dee21cd47..e9659cee4bac5f2d30c69c5dc82d8abe723890a6 100755 Binary files a/server/3rd/bin/x64/asynfile.dll and b/server/3rd/bin/x64/asynfile.dll differ diff --git a/server/3rd/bin/x64/asynipcs.dll b/server/3rd/bin/x64/asynipcs.dll index 6d1bf3259e0758c8a24fbe87a35f7da5baf6cc96..4296bb32b96fde8ed4f71f425500d2cd740e8a60 100755 Binary files a/server/3rd/bin/x64/asynipcs.dll and b/server/3rd/bin/x64/asynipcs.dll differ diff --git a/server/3rd/bin/x64/asynneta.dll b/server/3rd/bin/x64/asynneta.dll index 7856d621df1899d504a8c78534f42a55a22aef3d..dce1ebac57eb52cabb9c2d91b5d596f0d33b3fc2 100755 Binary files a/server/3rd/bin/x64/asynneta.dll and b/server/3rd/bin/x64/asynneta.dll differ diff --git a/server/3rd/bin/x64/asynsock.dll b/server/3rd/bin/x64/asynsock.dll index c8beda967ba9c5b047600bf38d2721b35bbfc6a9..29e2ac2f28c40cdfad4c204b92be4ee9ecf6ef89 100755 Binary files a/server/3rd/bin/x64/asynsock.dll and b/server/3rd/bin/x64/asynsock.dll differ diff --git a/server/3rd/bin/x64/console.dll b/server/3rd/bin/x64/console.dll index a6048c3f753e6ccbca6ba4db7394a87c0128d1b1..269c7081f8d4da5e2a7561368251c1555e21fe06 100755 Binary files a/server/3rd/bin/x64/console.dll and b/server/3rd/bin/x64/console.dll differ diff --git a/server/3rd/bin/x64/crashexplorer.dll b/server/3rd/bin/x64/crashexplorer.dll index 0623781dec29fc7c631387308b1b28302477f214..280968bf779e2f51d97c9a2e686338afb998420e 100755 Binary files a/server/3rd/bin/x64/crashexplorer.dll and b/server/3rd/bin/x64/crashexplorer.dll differ diff --git a/server/3rd/bin/x64/dns.dll b/server/3rd/bin/x64/dns.dll index 3d0a62b9d3e672c907d0c081998fceb5cb5919e8..7dd1ac8ade3173d9ddf6a651112eecf65e020dd6 100755 Binary files a/server/3rd/bin/x64/dns.dll and b/server/3rd/bin/x64/dns.dll differ diff --git a/server/3rd/bin/x64/dtp.dll b/server/3rd/bin/x64/dtp.dll index d0253b4dc538fc9fe971edd3a28c6376c0557de4..3b3e9cf2125fd814ca0f931f78a53c42b2b4e43f 100755 Binary files a/server/3rd/bin/x64/dtp.dll and b/server/3rd/bin/x64/dtp.dll differ diff --git a/server/3rd/bin/x64/ftp.dll b/server/3rd/bin/x64/ftp.dll index d459fb9ee9f081a991953f31f3bfed6202cf5d91..08bcf694ea2654a8dbd897555e5b335c6e15ae5a 100755 Binary files a/server/3rd/bin/x64/ftp.dll and b/server/3rd/bin/x64/ftp.dll differ diff --git a/server/3rd/bin/x64/http.dll b/server/3rd/bin/x64/http.dll index b052eb36604f5d1c8a7217348ee22aa19c1f2d61..ffbe5c5cf5d68b7d74ac0679ed2ca4c57d2ab00a 100755 Binary files a/server/3rd/bin/x64/http.dll and b/server/3rd/bin/x64/http.dll differ diff --git a/server/3rd/bin/x64/lua.dll b/server/3rd/bin/x64/lua.dll index c8bd96cc1f652678f6af20042c12318712743a01..227dc81c0ba33c1a86f14e31bc4658529f17ae86 100755 Binary files a/server/3rd/bin/x64/lua.dll and b/server/3rd/bin/x64/lua.dll differ diff --git a/server/3rd/bin/x64/prop.txt b/server/3rd/bin/x64/prop.txt index bcb2c74a9fce413279284d5f8c3cb1fd6e0a502d..86e46a854085500cdb23b576b2a447819164a965 100755 --- a/server/3rd/bin/x64/prop.txt +++ b/server/3rd/bin/x64/prop.txt @@ -1,4 +1,4 @@ -log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE +log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE ####################################################################### # STDOUT # @@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5 # ROLLING_LOG_FILE # ####################################################################### log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender -log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log +log4cplus.appender.ROLLING_LOG_FILE.File=prop.log log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5 # Truncate 'test' if it aleady exists. diff --git a/server/3rd/bin/x64/proxy.dll b/server/3rd/bin/x64/proxy.dll index a4968aeca388ec265fcf64a3c03b343fb9548cd1..4b0d61156e58f6e2109d9217ccf25143ceec6b60 100755 Binary files a/server/3rd/bin/x64/proxy.dll and b/server/3rd/bin/x64/proxy.dll differ diff --git a/server/3rd/bin/x64/ras.dll b/server/3rd/bin/x64/ras.dll index fda872d3b404f6430d47df0b1a7288ce9729684e..73189232ddf74291a31060df336480d43f74ee4f 100755 Binary files a/server/3rd/bin/x64/ras.dll and b/server/3rd/bin/x64/ras.dll differ diff --git a/server/3rd/bin/x64/rtsp.dll b/server/3rd/bin/x64/rtsp.dll index 92bbf04232844a69f640980c7b8cd044313a7067..7d3403d0fed2afcdec00011759e58814d2882b99 100755 Binary files a/server/3rd/bin/x64/rtsp.dll and b/server/3rd/bin/x64/rtsp.dll differ diff --git a/server/3rd/bin/x64/sqlite.dll b/server/3rd/bin/x64/sqlite.dll index 9dbcc439a3429823b4fa57a62a2e63d9f870be60..b1acbd6e8c880726f07335ebe2a1f150880e1e97 100755 Binary files a/server/3rd/bin/x64/sqlite.dll and b/server/3rd/bin/x64/sqlite.dll differ diff --git a/server/3rd/bin/x64/ssl.dll b/server/3rd/bin/x64/ssl.dll index 26fa60b91a867c7e731cd37a2188596d4f2d137a..5bfac9e0c74b5fe0be200c0bae9d15332d02dca9 100755 Binary files a/server/3rd/bin/x64/ssl.dll and b/server/3rd/bin/x64/ssl.dll differ diff --git a/server/3rd/bin/x64/websocket.dll b/server/3rd/bin/x64/websocket.dll index 0486a562e77b14e912d09ee8d543aa31625dee78..7610b830c579bbfc6014e142bac9678e09d45e16 100755 Binary files a/server/3rd/bin/x64/websocket.dll and b/server/3rd/bin/x64/websocket.dll differ diff --git a/server/3rd/bin/x64/zip.dll b/server/3rd/bin/x64/zip.dll index 9b2ac08022c722736de1b4e8ca0f19fe7800c949..804a3cf4253d63357f0dfb5890ffca3c56db8602 100755 Binary files a/server/3rd/bin/x64/zip.dll and b/server/3rd/bin/x64/zip.dll differ diff --git a/server/3rd/bin/zip.dll b/server/3rd/bin/zip.dll index 96e33bba32d461c15f523821c18086d8d45646cd..1c48bea4f8f182df1dd559c24bce89427416bab4 100755 Binary files a/server/3rd/bin/zip.dll and b/server/3rd/bin/zip.dll differ diff --git a/server/3rd/include/frame/AsynCore_internal.h b/server/3rd/include/frame/AsynCore_internal.h index 68dfeba037c993d9f29e480bdfe4d7d912004a79..916c13f8da73255778152adcf710754cf7fb38f6 100755 --- a/server/3rd/include/frame/AsynCore_internal.h +++ b/server/3rd/include/frame/AsynCore_internal.h @@ -113,6 +113,8 @@ END_ASYN_IOERROR() #define Io_connect ( 17) #define Io_bind ( 18) #define Io_hostdns ( 19) +#define Io_allocsize ( 20) +#define Io_flushfile ( 21) ///////////////////////////////////////////////////////////////////////////////// //ISpeedController.IObjectHolder(lType) diff --git a/server/3rd/include/frame/Console.h b/server/3rd/include/frame/Console.h index 1398d956aaef64a733d35776b152c5d291654416..b481bebbefb9853750a704afc8868ae6e2a8677b 100755 --- a/server/3rd/include/frame/Console.h +++ b/server/3rd/include/frame/Console.h @@ -43,6 +43,10 @@ NAMESPACE_BEGIN(asynsdk) //IConsole(InstanceName) #define IN_Console "com.asynframe.console" +///////////////////////////////////////////////////////////////////////////////// +#define ENABLE_INPUT_KEYBOARD 0x1 +#define ENABLE_INPUT_MOUSE 0x2 + NAMESPACE_END(asynsdk) #endif // !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_) \ No newline at end of file diff --git a/server/3rd/include/frame/app/AsynMessageEvents.h b/server/3rd/include/frame/app/AsynMessageEvents.h index 0433d736607b0f5f7108b508e82eea5bfc8bbc4b..642989b5004e3cd080ebe9c467e2487d79e51b8b 100755 --- a/server/3rd/include/frame/app/AsynMessageEvents.h +++ b/server/3rd/include/frame/app/AsynMessageEvents.h @@ -57,7 +57,7 @@ public: // COM_INTERFACE_ENTRY(IAsynMessageEvents) // END_COM_MAP() BEGIN_OBJ_MAP(CAsynMessageEvents_base) - OBJ_INTERFACE_ENTRY(IAsynMessageEvents) + OBJ_INTERFACE_ENTRY(IAsynMessageEvents) END_OBJ_MAP() public: //interface of IAsynMessageEvents diff --git a/server/3rd/lib/asynsdk_mini-MD.lib b/server/3rd/lib/asynsdk_mini-MD.lib index 07176587f4d8b54c93394695a75d2133bc472516..fc4b7a07139a6d8fc6911d31b48a63c66475d9ef 100755 Binary files a/server/3rd/lib/asynsdk_mini-MD.lib and b/server/3rd/lib/asynsdk_mini-MD.lib differ diff --git a/server/3rd/lib/asynsdk_mini-MDd.lib b/server/3rd/lib/asynsdk_mini-MDd.lib index 6a1011ba4a3ee0baf13ce2eaf412046016ec5a40..b1e6008140c0e15b3e6a0f4425919434c63bad69 100755 Binary files a/server/3rd/lib/asynsdk_mini-MDd.lib and b/server/3rd/lib/asynsdk_mini-MDd.lib differ diff --git a/server/3rd/lib/asynsdk_mini-MT.lib b/server/3rd/lib/asynsdk_mini-MT.lib index e54da558d6d51409eab1e5307a48e4cd2a338912..604d12f1db72016e185414d406f68bf5bc32c6e0 100755 Binary files a/server/3rd/lib/asynsdk_mini-MT.lib and b/server/3rd/lib/asynsdk_mini-MT.lib differ diff --git a/server/3rd/lib/asynsdk_mini-MTd.lib b/server/3rd/lib/asynsdk_mini-MTd.lib index 8f7d6c9939611484fb1eba71622f518d645ac640..5d59bd36bbc4458711ee29c0a8886484b8acc246 100755 Binary files a/server/3rd/lib/asynsdk_mini-MTd.lib and b/server/3rd/lib/asynsdk_mini-MTd.lib differ diff --git a/server/3rd/lib/x64/asynsdk_mini-MD.lib b/server/3rd/lib/x64/asynsdk_mini-MD.lib index 94350e57136a21c2a678c2aa75d3a67b35a919ec..6c52cd2369aa6c6759569a5ad0a65f3c371c14c5 100755 Binary files a/server/3rd/lib/x64/asynsdk_mini-MD.lib and b/server/3rd/lib/x64/asynsdk_mini-MD.lib differ diff --git a/server/3rd/lib/x64/asynsdk_mini-MDd.lib b/server/3rd/lib/x64/asynsdk_mini-MDd.lib index 8ffc28dad6bcc4788ca8e9631719c033323e24f4..058334b365e22c09cc7fa95f767f95a52e90b073 100755 Binary files a/server/3rd/lib/x64/asynsdk_mini-MDd.lib and b/server/3rd/lib/x64/asynsdk_mini-MDd.lib differ diff --git a/server/3rd/lib/x64/asynsdk_mini-MT.lib b/server/3rd/lib/x64/asynsdk_mini-MT.lib index 5dd35e2910500f9015028e8374e1375e752b0616..c85a4149331c9a39dc54b6b808625818bf12ec4d 100755 Binary files a/server/3rd/lib/x64/asynsdk_mini-MT.lib and b/server/3rd/lib/x64/asynsdk_mini-MT.lib differ diff --git a/server/3rd/lib/x64/asynsdk_mini-MTd.lib b/server/3rd/lib/x64/asynsdk_mini-MTd.lib index e9fdedfbd65d7a82a057806b13cc4938e8ad5ee0..cdf3ce9916473657363478debecdf042aad1479c 100755 Binary files a/server/3rd/lib/x64/asynsdk_mini-MTd.lib and b/server/3rd/lib/x64/asynsdk_mini-MTd.lib differ diff --git a/server/bin/ahttpserver-x64.exe b/server/bin/ahttpserver-x64.exe index 70710a94b6b7a7883a8b431bfce8344c92202818..91bc43c710d456da1133132c073f50e827a0a658 100755 Binary files a/server/bin/ahttpserver-x64.exe and b/server/bin/ahttpserver-x64.exe differ diff --git a/server/bin/ahttpserver.exe b/server/bin/ahttpserver.exe index 59898f59271c08e5c38f25367b9ee7ea0588191b..3220d0d9a43a4713c05003628fc211538579af1c 100755 Binary files a/server/bin/ahttpserver.exe and b/server/bin/ahttpserver.exe differ