1.8.0-20241111

ChangeLog

@@ -1 +1 @@
-2024-08-16 aftpx 集成asynframe-sdk_v1.7.1-20240816 https://github.com/netsecsp/asynframe
+2024-11-11 aftpx 集成asynframe-sdk_v1.8.0-20241111 https://github.com/netsecsp/asynframe

README.md

@@ -1,13 +1,13 @@
-> asynframe-sdk_v1.7.1-20240816.zip is from https://github.com/netsecsp/asynframe  
+> asynframe-sdk_v1.8.0-20241111.zip is from https://github.com/netsecsp/asynframe  
 
-# aftpx.exe  
-> IPv4/IPv6 ftp/ftps client program under windows  
+# aftpx  
+> IPv4/IPv6 ftp/ftps client program  
 
 1. support ftp/http and socks4/4a/5 proxy  
 2. support download directory  
 
-# aftpxserver.exe  
-> IPv4/IPv6 ftp/ftps server program under windows  
+# aftpxserver  
+> IPv4/IPv6 ftp/ftps server program  
 
 1. support download directory  
 2. support download from offset  

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

@@ -103,9 +103,9 @@ END_ASYN_IOERROR()
 #define IN_Plugins                      "plugins" //插件路径
 #define IN_SysArgv                      "sysargv" //系统参数
 
-#define IN_LogProp                      "logprop" //log4cplus配置的全路径
+#define IN_LogProp                      "logprop" //clog4cplus配置的全路径
 
-#define IN_LuaHost                      "luahost"
+#define IN_XvmHost                      "xvmhost" //lua/python存放IScriptHost对象指针
 
 /////////////////////////////////////////////////////////////////////////////////
 //AF_IOMSG_NOTIFY(lparam2)

client/3rd/include/frame/app/Setting.h

@@ -59,8 +59,10 @@ class CSetting
     std::string getString(const std::string &key, const std::string &default_value = "");
     void        setString(const std::string &key, const std::string &value);
 
-    int32_t     getNumber(const std::string &key, int32_t default_value = 0);
-    void        setNumber(const std::string &key, int32_t value );
+    int64_t     getNumber(const std::string &key, int64_t default_value= 0);
+    void        setNumber(const std::string &key, int64_t value );
+
+    bool hasExist(const std::string &key);
 
     void save()
     {

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:17 2024
+/* at Mon Nov 11 09:02:49 2024
  */
 /* Compiler settings for IAsynFileSystem.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:17 2024
+/* at Mon Nov 11 09:02:49 2024
  */
 /* Compiler settings for IAsynFileSystem.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Wed Aug 14 15:02:35 2024
+/* at Mon Nov 11 09:02:47 2024
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Wed Aug 14 15:02:35 2024
+/* at Mon Nov 11 09:02:47 2024
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:18 2024
+/* at Mon Nov 11 09:02:50 2024
  */
 /* Compiler settings for IAsynIpcChannel.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:18 2024
+/* at Mon Nov 11 09:02:50 2024
  */
 /* Compiler settings for IAsynIpcChannel.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:21 2024
+/* at Mon Nov 11 09:02:52 2024
  */
 /* Compiler settings for IAsynNetAgent.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:21 2024
+/* at Mon Nov 11 09:02:52 2024
  */
 /* Compiler settings for IAsynNetAgent.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:19 2024
+/* at Mon Nov 11 09:02:51 2024
  */
 /* Compiler settings for IAsynNetwork.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:19 2024
+/* at Mon Nov 11 09:02:51 2024
  */
 /* Compiler settings for IAsynNetwork.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:24 2024
+/* at Mon Nov 11 09:02:54 2024
  */
 /* Compiler settings for IConsole.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:24 2024
+/* at Mon Nov 11 09:02:54 2024
  */
 /* Compiler settings for IConsole.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:27 2024
+/* at Mon Nov 11 09:02:56 2024
  */
 /* Compiler settings for IDtp.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:27 2024
+/* at Mon Nov 11 09:02:56 2024
  */
 /* Compiler settings for IDtp.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:23 2024
+/* at Mon Nov 11 09:02:53 2024
  */
 /* Compiler settings for IExceptionTrapper.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:23 2024
+/* at Mon Nov 11 09:02:53 2024
  */
 /* Compiler settings for IExceptionTrapper.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:28 2024
+/* at Mon Nov 11 09:02:56 2024
  */
 /* Compiler settings for INet.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:28 2024
+/* at Mon Nov 11 09:02:56 2024
  */
 /* Compiler settings for INet.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:34 2024
+/* at Mon Nov 11 09:03:00 2024
  */
 /* Compiler settings for IProxy.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:34 2024
+/* at Mon Nov 11 09:03:00 2024
  */
 /* Compiler settings for IProxy.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:41 2024
+/* at Mon Nov 11 09:03:05 2024
  */
 /* Compiler settings for IScriptHost.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:41 2024
+/* at Mon Nov 11 09:03:05 2024
  */
 /* Compiler settings for IScriptHost.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:29 2024
+/* at Mon Nov 11 09:02:57 2024
  */
 /* Compiler settings for ISsl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:29 2024
+/* at Mon Nov 11 09:02:57 2024
  */
 /* Compiler settings for ISsl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:08 2024
+/* at Mon Nov 11 09:02:40 2024
  */
 /* Compiler settings for ITypedef.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 
@@ -93,6 +93,7 @@ extern "C"{
 /* [local] */ 
 
 #pragma pack(push, 1)
+
 typedef void *handle;
 
 typedef struct tagRANGE

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

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Aug 09 20:55:08 2024
+/* at Mon Nov 11 09:02:40 2024
  */
 /* Compiler settings for ITypedef.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/com/ObjPtr.h

@@ -37,22 +37,14 @@ template <class T>
 class CObjPtr
 {
 public:
-    CObjPtr(T *v = NULL, bool iAddref = true)
+    CObjPtr(T *v = NULL, bool addref = true)
     {
         p = v;
-        if( p && iAddref )
+        if( p && addref )
         {
             p->AddRef();
         }
     }
-    CObjPtr(bool unused, IUnknown *v)
-    {
-        if(!v ||
-            v->QueryInterface(__uuidof(T), (void**)&p) != S_OK )
-        {
-            p = NULL;
-        }
-    }
     CObjPtr(const CObjPtr<T> &v)
     {
         p = v.p;
@@ -70,13 +62,14 @@ class CObjPtr
     }
 
 public:
-    void Attach(T *v) throw()
+    T   *Attach(T *v) throw()
     {
         if( p )
         {
             p->Release();
         }
         p = v;
+        return p;
     }
     // Detach the interface (does not Release)
     T   *Detach()
@@ -103,12 +96,6 @@ class CObjPtr
         }
     }
 
-    template<class C>
-    C    Docast()
-    {
-        return static_cast<C>(p);
-    }
-
     void Swap(CObjPtr<T> &v)
     {
         T* t = p; p = v.p; v.p = t;
@@ -139,12 +126,12 @@ class CObjPtr
     {
         return p == v;
     }
-    T  *operator->() const throw()
+    T   *operator->() const throw()
     {
         return p;
     }
 
-    T  *operator=(T *v) throw()
+    T   *operator=(T *v) throw()
     {
         if( p )
         {
@@ -154,7 +141,7 @@ class CObjPtr
         p = v;   if( p ) p->AddRef();
         return p;
     }
-    T  *operator=(const CObjPtr<T> &v) throw()
+    T   *operator=(const CObjPtr<T> &v) throw()
     {
         if( p )
         {

client/3rd/include/frame/com/Unknown.h

@@ -67,7 +67,7 @@ class CSingleThreadModelObject
     ULONG UnknownRelease();
 
     template<typename T> 
-    T *DoCast(bool iAddRef = false ) {
+    T *Cast(bool iAddRef = false ) {
        if( iAddRef ) UnknownAddRef();
        return dynamic_cast<T*>(this);
     }
@@ -90,7 +90,7 @@ class CMultiThreadModelObject
     ULONG UnknownRelease();
 
     template<typename T> 
-    T *DoCast(bool iAddRef = false ) {
+    T *Cast(bool iAddRef = false ) {
        if( iAddRef ) UnknownAddRef();
        return dynamic_cast<T*>(this);
     }

client/3rd/include/frame/jvm/JniProxy.h

@@ -48,8 +48,12 @@ extern "C" {
 NAMESPACE_BEGIN(jvm)
 
 /////////////////////////////////////////////////////////////////////
-IScriptHost *GetScriptHost( /*[in ]*/JNIEnv *env );
-jobject Bind( /*[in ]*/JNIEnv *env, /*[in ]*/IUnknown* object, jboolean need_java_release = JNI_FALSE );
+IScriptHost *GetScriptHost( /*[in ]*/JNIEnv *env ); //get from CInstanceManager.getNativeObject
+
+//生成object对应的java对象
+//1.addref_for_jvm=true表示不用时需要在java端主动调用release才能释放c对象
+//2.auto_bindc_jvm=true表示调用SObject.Set绑定java对象
+jobject      Create( /*[in ]*/JNIEnv *env, /*[in ]*/IUnknown *object, /*[in ]*/const char *name, /*[in ]*/bool addref_for_jvm = false, /*[in ]*/bool auto_bindc_jvm = false );
 /////////////////////////////////////////////////////////////////////
 
 NAMESPACE_END(jvm)