updates.

diff --git a/CHANGES b/CHANGES
index 7bc474dd82f2d20d7475284a82ae3bd845835d04..0644985805c6819465d62cd85a8722b62020d4ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Tue Oct 23 13:51:19 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Win32 Toolkit changes.  Affected files
+         win32/silc.dsw, win32/libsilc/libsilc.def,
+         win32/libsilcclient/libsilc.def,
+         lib/silcutil/silcutil.c, and
+         lib/sftp/sftp_fs_memory.c.
+
 Mon Oct 22 16:35:05 EDT 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Added silc_net_localip to return local host's IP address.

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 296972f47c0d28cc0195c656a8cb0ac6a2eadf8b..755b26861200ceed5c4291a39f9a04e13cd3d167 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -196,7 +196,10 @@ typedef signed long int64;
 #ifndef WIN32
 typedef unsigned long long uint64;
 typedef signed long long int64;
-#endif
+#else
+typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */\r
+typedef int32 int64;\r
+#endif\r
 #else
 typedef uint32 uint64;
 typedef int32 int64;

diff --git a/lib/silcsftp/sftp_fs_memory.c b/lib/silcsftp/sftp_fs_memory.c
index 81434c13b816260bda3359871bdcd96f1b953c4d..04979b720f90a84995c7ec00b5462869eed1f6b1 100644 (file)
--- a/lib/silcsftp/sftp_fs_memory.c
+++ b/lib/silcsftp/sftp_fs_memory.c
@@ -730,8 +730,12 @@ void mem_readdir(void *context, SilcSFTP sftp,
       *strrchr(date, ':') = '\0';
 
     if (!entry->directory)
-      if (!lstat(entry->data + 7, &stats))
-       filesize = stats.st_size;
+#ifndef SILC_WIN32\r
+               if (!lstat(entry->data + 7, &stats))
+#else\r
+               if (!stat(entry->data + 7, &stats))\r
+#endif\r
+                       filesize = stats.st_size;\r
 
     /* Long name format is:
        drwx------   1   324210 Apr  8 08:40 mail/
@@ -861,7 +865,11 @@ void mem_lstat(void *context, SilcSFTP sftp,
   }    
 
   /* Get real stat */
+#ifndef SILC_WIN32\r
   ret = lstat(entry->data + 7, &stats);
+#else\r
+  ret = stat(entry->data + 7, &stats);\r
+#endif\r
   if (ret == -1) {
     (*callback)(sftp, silc_sftp_map_errno(errno), NULL, callback_context);
     return;

diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c
index 0ee0dd6816e15f64e4e22cdd1b9ce236b4329dc7..c61e70ce4836026c38789cdefc2250c1f192ee53 100644 (file)
--- a/lib/silcutil/silcutil.c
+++ b/lib/silcutil/silcutil.c
@@ -165,9 +165,13 @@ uint64 silc_file_size(const char *filename)
   int ret;
   struct stat stats;
 
+#ifndef SILC_WIN32\r
   ret = lstat(filename, &stats);
-  if (ret < 0)
-    return 0;
+#else\r
+  ret = stat(filename, &stats);\r
+#endif\r
+  if (ret < 0)\r
+    return 0;\r
 
   return (uint64)stats.st_size;
 }

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 5faffd8e8f8eedaf09e6f017b650eb4b0a80a16d..44b20fb6fcf679bae73767806100c9c4607a41ad 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -124,9 +124,9 @@ EXPORTS
        silc_default_pkcs @ 333 ; 
        silc_encode_pem @ 334 ; 
        silc_encode_pem_file @ 335 ; 
-       silc_file_read @ 336 ; 
-       silc_file_write @ 337 ; 
-       silc_file_write_mode @ 338 ; 
+       silc_file_readfile @ 336 ; 
+       silc_file_writefile @ 337 ; 
+       silc_file_writefile_mode @ 338 ; 
        silc_format @ 339 ; 
        silc_free @ 340 ; 
        silc_get_time @ 341 ; 
@@ -180,7 +180,6 @@ EXPORTS
        silc_hmac_len @ 389 ; 
        silc_hmac_list @ 390 ; 
        silc_hmac_make @ 391 ; 
-       silc_hmac_make_internal @ 392 ; 
        silc_hmac_make_truncated @ 393 ; 
        silc_hmac_make_with_key @ 394 ; 
        silc_hmac_register @ 395 ; 
@@ -331,7 +330,6 @@ EXPORTS
        silc_packet_context_alloc @ 540 ; 
        silc_packet_context_dup @ 541 ; 
        silc_packet_context_free @ 542 ; 
-       silc_packet_decrypt @ 543 ; 
        silc_packet_encrypt @ 544 ; 
        silc_packet_parse @ 545 ; 
        silc_packet_parse_special @ 546 ; 
@@ -573,38 +571,51 @@ EXPORTS
        trq_list_rewind_to @ 786 ; 
        trq_list_swap @ 787 ; 
        trq_list_to_deque @ 788 ; 
-       silc_buffer_format_vp @ 769 ; 
-       silc_buffer_unformat_vp @ 770 ; 
-       silc_sftp_client_start @ 771 ;
-       silc_sftp_client_shutdown @ 772 ;
-       silc_sftp_client_receive_process @ 773 ;
-       silc_sftp_open @ 773 ;
-       silc_sftp_close @ 774 ;
-       silc_sftp_read @ 775 ;
-       silc_sftp_write @ 776 ;
-       silc_sftp_remove @ 777 ;
-       silc_sftp_rename @ 778 ;
-       silc_sftp_mkdir @ 779 ;
-       silc_sftp_rmdir @ 780 ;
-       silc_sftp_opendir @ 781 ;
-       silc_sftp_readdir @ 782 ;
-       silc_sftp_stat @ 783 ;
-       silc_sftp_lstat @ 784 ;
-       silc_sftp_fstat @ 785 ;
-       silc_sftp_setstat @ 786 ;
-       silc_sftp_fsetstat @ 787 ;
-       silc_sftp_readlink @ 788 ;
-       silc_sftp_symlink @ 789 ;
-       silc_sftp_realpath @ 790 ;
-       silc_sftp_extended @ 791 ;
-       silc_sftp_server_start @ 792 ;
-       silc_sftp_server_shutdown @ 793 ;
-       silc_sftp_server_receive_process @ 793 ;
-       silc_sftp_fs_memory @ 794 ;
-       silc_sftp_fs_memory_alloc @ 795 ;
-       silc_sftp_fs_memory_free @ 796 ;
-       silc_sftp_fs_memory_add_dir @ 797 ;
-       silc_sftp_fs_memory_del_dir @ 798 ;
-       silc_sftp_fs_memory_add_file @ 799 ;
-       silc_sftp_fs_memory_del_file @ 800 ;
-       silc_net_addr2bin_ne @ 801 ; 
+       silc_buffer_format_vp @ 789 ; 
+       silc_buffer_unformat_vp @ 790 ; 
+       silc_sftp_client_start @ 791 ;
+       silc_sftp_client_shutdown @ 792 ;
+       silc_sftp_client_receive_process @ 793 ;
+       silc_sftp_open @ 794 ;
+       silc_sftp_close @ 795 ;
+       silc_sftp_read @ 796 ;
+       silc_sftp_write @ 797 ;
+       silc_sftp_remove @ 798 ;
+       silc_sftp_rename @ 799 ;
+       silc_sftp_mkdir @ 800 ;
+       silc_sftp_rmdir @ 801 ;
+       silc_sftp_opendir @ 802 ;
+       silc_sftp_readdir @ 803 ;
+       silc_sftp_stat @ 804 ;
+       silc_sftp_lstat @ 805 ;
+       silc_sftp_fstat @ 806 ;
+       silc_sftp_setstat @ 807 ;
+       silc_sftp_fsetstat @ 808 ;
+       silc_sftp_readlink @ 809 ;
+       silc_sftp_symlink @ 810 ;
+       silc_sftp_realpath @ 811 ;
+       silc_sftp_extended @ 812 ;
+       silc_sftp_server_start @ 813 ;
+       silc_sftp_server_shutdown @ 814 ;
+       silc_sftp_server_receive_process @ 815 ;
+       silc_sftp_fs_memory @ 816 ;
+       silc_sftp_fs_memory_alloc @ 817 ;
+       silc_sftp_fs_memory_free @ 818 ;
+       silc_sftp_fs_memory_add_dir @ 819 ;
+       silc_sftp_fs_memory_del_dir @ 820 ;
+       silc_sftp_fs_memory_add_file @ 821 ;
+       silc_sftp_fs_memory_del_file @ 822 ;
+       silc_net_addr2bin_ne @ 823 ;
+       silc_file_open @ 824 ;
+       silc_file_close @ 825 ;
+       silc_file_read @ 826 ;
+       silc_file_write @ 827 ;
+       silc_file_size @ 828 ;
+       silc_hmac_init @ 829 ;
+       silc_hmac_update @ 830 ;
+       silc_hmac_final @ 831 ;
+       silc_hmac_init_with_key @ 832 ;
+       silc_hmac_get_name @ 833 ;
+       silc_hmac_get_hash @ 834 ;
+       silc_net_localip @ 835 ;
+       silc_sftp_server_set_monitor @ 836 ;

diff --git a/win32/libsilc/libsilc.dsp b/win32/libsilc/libsilc.dsp
index ce944127264d380b9c61a99853070d3485f33f4a..f85c43df079d677c5a5f9130f8a426c42facb255 100644 (file)
--- a/win32/libsilc/libsilc.dsp
+++ b/win32/libsilc/libsilc.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /FD /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "SILC_DEBUG" /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "SILC_DEBUG" /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
@@ -133,10 +133,6 @@ SOURCE=..\..\lib\silccore\silcpayload.c
 \r
 SOURCE=..\..\lib\silccore\silcprivate.c\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silccore\silcprotocol.c\r
-# End Source File\r
 # End Group\r
 # Begin Group "silcske"\r
 \r
@@ -183,6 +179,10 @@ SOURCE=..\..\lib\silcutil\silcnet.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcprotocol.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcschedule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -454,6 +454,26 @@ SOURCE=..\..\lib\trq\trq_list_x_015.c
 SOURCE=..\..\lib\trq\trq_list_x_016.c\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcsftp No. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\sftp_client.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\sftp_fs_memory.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\sftp_server.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\sftp_util.c\r
+# End Source File\r
+# End Group\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -501,10 +521,6 @@ SOURCE=..\..\lib\silccore\silcpayload.h
 \r
 SOURCE=..\..\lib\silccore\silcprivate.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silccore\silcprotocol.h\r
-# End Source File\r
 # End Group\r
 # Begin Group "silcske No. 1"\r
 \r
@@ -571,6 +587,10 @@ SOURCE=..\..\lib\silcutil\silcnet.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcprotocol.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silcschedule.h\r
 # End Source File\r
 # Begin Source File\r
@@ -802,6 +822,22 @@ SOURCE=..\..\lib\trq\trq_list_f.h
 SOURCE=..\..\lib\trq\trq_list_x.h\r
 # End Source File\r
 # End Group\r
+# Begin Group "silcsftp"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\sftp_util.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\silcsftp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcsftp\silcsftp_fs.h\r
+# End Source File\r
+# End Group\r
 # Begin Source File\r
 \r
 SOURCE=..\silcdefs.h\r

diff --git a/win32/libsilcclient/libsilcclient.def b/win32/libsilcclient/libsilcclient.def
index 26dcc0468c6d3da791b566791b866d8c86810fc6..8845650f196d1e12a99dc30ac09a62eae0889f2e 100644 (file)
--- a/win32/libsilcclient/libsilcclient.def
+++ b/win32/libsilcclient/libsilcclient.def
@@ -144,7 +144,6 @@ EXPORTS
        silc_client_send_key_agreement @ 127 ; \r
        silc_client_send_private_message @ 128 ; \r
        silc_client_send_private_message_key @ 129 ; \r
-       silc_client_set_away_message @ 130 ; \r
        silc_client_start_key_exchange @ 131 ; \r
        silc_client_stop @ 132 ; \r
        silc_command_list @ 133 ; \r
@@ -155,4 +154,7 @@ EXPORTS
        silc_client_abort_key_agreement @ 138 ; \r
        silc_client_set_away_message @ 139 ; \r
        silc_client_request_authentication_method @ 140 ; \r
-\r
+       silc_client_file_send @ 141 ;\r
+       silc_client_file_receive @ 142 ;\r
+       silc_client_file_close @ 143 ;\r
+       \r

diff --git a/win32/libsilcclient/libsilcclient.dsp b/win32/libsilcclient/libsilcclient.dsp
index a015223b46e34bdc2a946034f9a313c78e9502d4..29ab2599daea0e60bbc302618592a3d9e36cd129 100644 (file)
--- a/win32/libsilcclient/libsilcclient.dsp
+++ b/win32/libsilcclient/libsilcclient.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /D "_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "SILC_DEBUG" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "SILC_DEBUG" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -104,6 +104,10 @@ SOURCE=..\..\lib\silcclient\client_channel.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcclient\client_ftp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcclient\client_keyagr.c\r
 # End Source File\r
 # Begin Source File\r
@@ -135,7 +139,7 @@ SOURCE=..\..\lib\silcclient\protocol.c
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Group "silccliente"\r
+# Begin Group "silcclient No. 1"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r