1.3.2-20230130

ChangeLog

-2023-01-28 ahttp 1.3
-	1. 集成asynsdk: 1.3.2-20230128, https://github.com/netsecsp/asynframe
+2023-01-30 ahttp 集成asynframe-sdk_v1.3.2-20230130 https://github.com/netsecsp/asynframe
+

README.md

-> asynframe-sdk_v1.3.2-20230128.zip is from https://github.com/netsecsp/asynframe  
+> asynframe-sdk_v1.3.2-20230130.zip is from https://github.com/netsecsp/asynframe  
 
 # ahttpclient.exe  
 > supports IPv4/IPv6 http/https client program under windows  

client/3rd/bin/prop.txt

+log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+
+#######################################################################
+# STDOUT                                                              #
+#######################################################################
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
+
+#######################################################################
+# ROLLING_LOG_FILE                                                    #
+#######################################################################
+log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
+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.
+log4cplus.appender.ROLLING_LOG_FILE.Append=false
+log4cplus.appender.ROLLING_LOG_FILE.layout=log4cplus::PatternLayout
+log4cplus.appender.ROLLING_LOG_FILE.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
\ No newline at end of file

client/3rd/bin/x64/prop.txt

+log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+
+#######################################################################
+# STDOUT                                                              #
+#######################################################################
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
+
+#######################################################################
+# ROLLING_LOG_FILE                                                    #
+#######################################################################
+log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
+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.
+log4cplus.appender.ROLLING_LOG_FILE.Append=false
+log4cplus.appender.ROLLING_LOG_FILE.layout=log4cplus::PatternLayout
+log4cplus.appender.ROLLING_LOG_FILE.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
\ No newline at end of file

client/3rd/include/frame/Dtp.h

+// Dtp.h: interface.
+//
+/////////////////////////////////////////////////////////////////////////////////
+#if !defined(AFX_DTP_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_DTP_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+/*****************************************************************************
+Copyright (c) netsecsp 2012-2032, All rights reserved.
+
+Developer: Shengqian Yang, from China, E-mail: netsecsp@hotmail.com, last updated 05/01/2022
+http://asynframe.sf.net
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions
+and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "AsynNetwork_internal.h"
+#include "asm/IDtp.h"
+NAMESPACE_BEGIN(asynsdk)
+
+/////////////////////////////////////////////////////////////////////////////////
+#define IN_Dtp "com.svc.dtp"
+
+NAMESPACE_END(asynsdk)
+
+#endif // !defined(AFX_DTP_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
\ No newline at end of file

client/3rd/include/frame/asm/IAsynFrame.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Sat Jan 28 08:50:47 2023
+/* at Sun Jan 29 15:12:31 2023
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 
@@ -3090,8 +3090,7 @@ EXTERN_C const IID IID_InstancesManager;
             /* [in] */ IUnknown *lpObject) = 0;
         
         virtual HRESULT STDMETHODCALLTYPE Require( 
-            /* [in] */ STRING Owner,
-            /* [out] */ IUnknown **ppObject) = 0;
+            /* [in] */ STRING Owner) = 0;
         
         virtual HRESULT STDMETHODCALLTYPE Observe( 
             /* [in] */ handle Soctx) = 0;
@@ -3144,8 +3143,7 @@ EXTERN_C const IID IID_InstancesManager;
         
         HRESULT ( STDMETHODCALLTYPE *Require )( 
             InstancesManager * This,
-            /* [in] */ STRING Owner,
-            /* [out] */ IUnknown **ppObject);
+            /* [in] */ STRING Owner);
         
         HRESULT ( STDMETHODCALLTYPE *Observe )( 
             InstancesManager * This,
@@ -3187,8 +3185,8 @@ EXTERN_C const IID IID_InstancesManager;
 #define InstancesManager_SetInstance(This,Name,lpObject)	\
     ( (This)->lpVtbl -> SetInstance(This,Name,lpObject) ) 
 
-#define InstancesManager_Require(This,Owner,ppObject)	\
-    ( (This)->lpVtbl -> Require(This,Owner,ppObject) ) 
+#define InstancesManager_Require(This,Owner)	\
+    ( (This)->lpVtbl -> Require(This,Owner) ) 
 
 #define InstancesManager_Observe(This,Soctx)	\
     ( (This)->lpVtbl -> Observe(This,Soctx) ) 

client/3rd/include/frame/asm/IAsynFrame_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Sat Jan 28 08:50:47 2023
+/* at Sun Jan 29 15:12:31 2023
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/project/windows/ahttpclient.vcxproj

@@ -67,18 +67,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Debug\</IntDir>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\$(Platform)\</OutDir>
+    <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Debug\</IntDir>
+    <TargetName>$(ProjectName)-$(Platform)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Release\</IntDir>
+    <TargetName>$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\$(Platform)\</OutDir>
+    <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Release\</IntDir>
+    <TargetName>$(ProjectName)-$(Platform)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -94,7 +98,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)ahttpclient.pdb</ProgramDatabaseFile>
@@ -115,7 +119,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName)-$(Platform).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)ahttpclient.pdb</ProgramDatabaseFile>
@@ -133,7 +137,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -153,7 +157,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName)-$(Platform).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>

client/project/windows/ahttpclient_2013.vcxproj

@@ -68,16 +68,18 @@
     <IntDir>.\Debug\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\$(Platform)\</OutDir>
+    <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Debug\</IntDir>
+    <TargetName>$(ProjectName)-$(Platform)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Release\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\$(Platform)\</OutDir>
+    <OutDir>..\..\bin\</OutDir>
     <IntDir>.\Release\</IntDir>
+    <TargetName>$(ProjectName)-$(Platform)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -93,7 +95,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)ahttpclient.pdb</ProgramDatabaseFile>
@@ -114,7 +116,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName)-$(Platform).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)ahttpclient.pdb</ProgramDatabaseFile>
@@ -132,7 +134,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -152,7 +154,7 @@
       <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <OutputFile>$(OutDir)ahttpclient.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName)-$(Platform).exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\3rd\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>

client/src/Downloader.cpp

@@ -176,16 +176,16 @@ HRESULT CDownloader::OnIomsgNotify( uint64_t lParam1, uint64_t lAction, IAsynIoO
                 break;
             }
 
-            m_spInstanceManager->Require(STRING_from_string(IN_AsynFileSystem), 0);
-            CComPtr<IAsynFileSystem> spAsynFileSystem;
-            HRESULT r1 = m_spInstanceManager->GetInstance(STRING_from_string(IN_AsynFileSystem), IID_IAsynFileSystem, (void **)&spAsynFileSystem);
-            if( r1 != S_OK )
+            if( m_spInstanceManager->Require(STRING_from_string(IN_AsynFileSystem)) != S_OK )
             {
                 printf("can't load plugin: %s\n", IN_AsynFileSystem);
                 SetEvent(m_hNotify);
                 break;
             }
 
+            CComPtr<IAsynFileSystem> spAsynFileSystem;
+            m_spInstanceManager->GetInstance(STRING_from_string(IN_AsynFileSystem), IID_IAsynFileSystem, (void **)&spAsynFileSystem);
+
             CComPtr<IAsynFile> spAsynFile;
             spAsynFileSystem->CreateAsynFile(&spAsynFile);
             HRESULT r2 = spAsynFile->Open( m_spAsynFrameThread,

client/src/Main.cpp

@@ -93,7 +93,7 @@ int _tmain(int argc, _TCHAR *argv[])
     {
         InstancesManager *lpInstancesManager = GetInstancesManager();
 
-        if( lpInstancesManager->Require(STRING_from_string(IN_AsynNetwork), 0) != S_OK )
+        if( lpInstancesManager->Require(STRING_from_string(IN_AsynNetwork)) != S_OK )
         {
             printf("can't load plugin: %s\n", IN_AsynNetwork);
             break;

server/3rd/bin/prop.txt

+log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+
+#######################################################################
+# STDOUT                                                              #
+#######################################################################
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
+
+#######################################################################
+# ROLLING_LOG_FILE                                                    #
+#######################################################################
+log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
+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.
+log4cplus.appender.ROLLING_LOG_FILE.Append=false
+log4cplus.appender.ROLLING_LOG_FILE.layout=log4cplus::PatternLayout
+log4cplus.appender.ROLLING_LOG_FILE.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5t] %-5p %20c - %m%n
\ No newline at end of file