updates.

diff --git a/CHANGES b/CHANGES
index 25e2a1cd18accaa6b939775e5917dc47edebf085..0aa26c85315d1de32a62a313ca091983e27a6ce1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,23 @@
+Tue May  8 18:13:38 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Changed private message waiting API in client library to make
+         it work better with multiple waiting threads.  The waiting is
+         not always per client entry instead of per connection.  Affected
+         files are lib/silcclient/client_prvmsg.c, client.h and
+         silcclient.h.
+
+       * Changed silc_packet_wait_init function to accept the the expected
+         Source ID of the packet as argument.  If specified only packets
+         with the specified types and Source ID are delivered.  Affected
+         files are lib/silccore/silcpacket.[ch].
+
+       * Fixed file transfer disconnection crash when closing the session
+         directly in the monitor callback after disconnection.  Affected
+         file is lib/silcclient/client_ftp.c.
+
+       * Make Toolkit compile on WIN32.  Affected files in win32/
+         and in lib/silcutil/win32/.
+
 Mon May  7 18:18:48 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed CMODE channel auth public key retrieval.  Affected

diff --git a/win32/libsilcclient/libsilcclient.def b/win32/libsilcclient/libsilcclient.def
index 73c2643b19b8960545522cba2c7cb3598c29f799..5bb9e9bbb2b54e07ffd81bfc8e37467c7b02c658 100644 (file)
--- a/win32/libsilcclient/libsilcclient.def
+++ b/win32/libsilcclient/libsilcclient.def
@@ -1,170 +1,74 @@
-;
-; Exports file for SILC Client DLL.
-;
-; This file is generated from MinGW compiled object files using the
-; following command:
-;
-; dlltool --export-all --output-def libsilc.def libsilc.a
-;
-; ----------------------------------------------------------------------------
-;
-; If you edit this file by adding or removing any exports be sure to
-; preserve the ordinal values (the @ n in the exports) and add new exports
-; always at the end of the list with new ordinal value. Do not ever
-; add new export with old ordinal value if you need to preserve backwards
-; compatiblity. -Pekka
-;
-EXPORTS
-       silc_ske_check_version @ 1 ;
-       silc_client_add_channel_private_key @ 2 ;
-       silc_client_add_connection @ 3 ;
-       silc_client_add_private_message_key @ 4 ;
-       silc_client_add_private_message_key_ske @ 5 ;
-       silc_client_add_socket @ 6 ;
-       silc_client_alloc @ 7 ;
-       silc_client_channel_message @ 8 ;
-       silc_client_close_connection @ 9 ;
-       silc_client_command_alloc @ 10 ;
-       silc_client_command_ban @ 11 ;
-       silc_client_command_close @ 12 ;
-       silc_client_command_cmode @ 13 ;
-       silc_client_command_connect @ 14 ;
-       silc_client_command_cumode @ 15 ;
-       silc_client_command_dup @ 16 ;
-       silc_client_command_find @ 17 ;
-       silc_client_command_free @ 18 ;
-       silc_client_command_get_channel_by_id_callback @ 19 ;
-       silc_client_command_get_client_by_id_callback @ 20 ;
-       silc_client_command_get_client_callback @ 21 ;
-       silc_client_command_get_clients_list_callback @ 22 ;
-       silc_client_command_getkey @ 23 ;
-       silc_client_command_identify @ 24 ;
-       silc_client_command_info @ 25 ;
-       silc_client_command_invite @ 26 ;
-       silc_client_command_join @ 27 ;
-       silc_client_command_kick @ 28 ;
-       silc_client_command_kill @ 29 ;
-       silc_client_command_leave @ 30 ;
-       silc_client_command_list @ 31 ;
-       silc_client_command_motd @ 32 ;
-       silc_client_command_nick @ 33 ;
-       silc_client_command_oper @ 34 ;
-       silc_client_command_pending @ 35 ;
-       silc_client_command_pending_check @ 36 ;
-       silc_client_command_pending_del @ 37 ;
-       silc_client_command_ping @ 38 ;
-       silc_client_command_quit @ 39 ;
-       silc_client_command_reply_ban @ 40 ;
-       silc_client_command_reply_close @ 41 ;
-       silc_client_command_reply_cmode @ 42 ;
-       silc_client_command_reply_connect @ 43 ;
-       silc_client_command_reply_cumode @ 44 ;
-       silc_client_command_reply_free @ 45 ;
-       silc_client_command_reply_getkey @ 46 ;
-       silc_client_command_reply_identify @ 47 ;
-       silc_client_command_reply_info @ 48 ;
-       silc_client_command_reply_invite @ 49 ;
-       silc_client_command_reply_join @ 50 ;
-       silc_client_command_reply_kick @ 51 ;
-       silc_client_command_reply_kill @ 52 ;
-       silc_client_command_reply_leave @ 53 ;
-       silc_client_command_reply_list @ 54 ;
-       silc_client_command_reply_motd @ 55 ;
-       silc_client_command_reply_nick @ 56 ;
-       silc_client_command_reply_oper @ 57 ;
-       silc_client_command_reply_ping @ 58 ;
-       silc_client_command_reply_process @ 59 ;
-       silc_client_command_reply_shutdown @ 60 ;
-       silc_client_command_reply_silcoper @ 61 ;
-       silc_client_command_reply_topic @ 62 ;
-       silc_client_command_reply_umode @ 63 ;
-       silc_client_command_reply_users @ 64 ;
-       silc_client_command_reply_whois @ 65 ;
-       silc_client_command_reply_whowas @ 66 ;
-       silc_client_command_shutdown @ 67 ;
-       silc_client_command_silcoper @ 68 ;
-       silc_client_command_topic @ 70 ;
-       silc_client_command_umode @ 71 ;
-       silc_client_command_users @ 72 ;
-       silc_client_command_whois @ 73 ;
-       silc_client_command_whowas @ 74 ;
-       silc_client_connect_to_server @ 75 ;
-       silc_client_del_channel @ 76 ;
-       silc_client_del_channel_private_key @ 77 ;
-       silc_client_del_channel_private_keys @ 78 ;
-       silc_client_del_client @ 79 ;
-       silc_client_del_client_entry @ 80 ;
-       silc_client_del_connection @ 81 ;
-       silc_client_del_private_message_key @ 82 ;
-       silc_client_del_server @ 83 ;
-       silc_client_del_socket @ 84 ;
-       silc_client_disconnected_by_server @ 85 ;
-       silc_client_error_by_server @ 86 ;
-       silc_client_free @ 87 ;
-       silc_client_free_channel_private_keys @ 88 ;
-       silc_client_free_private_message_keys @ 89 ;
-       silc_client_get_channel @ 90 ;
-       silc_client_get_channel_by_id @ 91 ;
-       silc_client_get_channel_by_id_resolve @ 92 ;
-       silc_client_get_client_by_id @ 93 ;
-       silc_client_get_client_by_id_resolve @ 94 ;
-       silc_client_get_clients @ 95 ;
-       silc_client_get_clients_by_list @ 96 ;
-       silc_client_get_clients_local @ 97 ;
-       silc_client_get_server @ 98 ;
-       silc_client_get_server_by_id @ 99 ;
-       silc_client_init @ 100 ;
-       silc_client_key_agreement @ 101 ;
-       silc_client_list_channel_private_keys @ 102 ;
-       silc_client_list_private_message_keys @ 103 ;
-       silc_client_notify_by_server @ 105 ;
-       silc_client_packet_process @ 106 ;
-       silc_client_packet_send @ 107 ;
-       silc_client_packet_send_real @ 108 ;
-       silc_client_perform_key_agreement @ 109 ;
-       silc_client_perform_key_agreement_fd @ 110 ;
-       silc_client_private_message @ 111 ;
-       silc_client_private_message_key @ 112 ;
-       silc_client_process_failure @ 113 ;
-       silc_client_protocol_ke_send_packet @ 114 ;
-       silc_client_protocol_ke_set_keys @ 115 ;
-       silc_client_protocol_ke_verify_key @ 116 ;
-       silc_client_protocols_register @ 117 ;
-       silc_client_protocols_unregister @ 118 ;
-       silc_client_receive_channel_key @ 119 ;
-       silc_client_receive_new_id @ 120 ;
-       silc_client_remove_from_channels @ 121 ;
-       silc_client_replace_from_channels @ 122 ;
-       silc_client_run @ 123 ;
-       silc_client_save_channel_key @ 124 ;
-       silc_client_send_channel_message @ 125 ;
-       silc_client_command_send @ 126 ;
-       silc_client_send_key_agreement @ 127 ;
-       silc_client_send_private_message @ 128 ;
-       silc_client_send_private_message_key_request @ 129 ;
-       silc_client_start_key_exchange @ 131 ;
-       silc_client_stop @ 132 ;
-       silc_idlist_get_client @ 137 ;
-       silc_client_abort_key_agreement @ 138 ;
-       silc_client_set_away_message @ 139 ;
-       silc_client_request_authentication_method @ 140 ;
-       silc_client_file_send @ 141 ;
-       silc_client_file_receive @ 142 ;
-       silc_client_file_close @ 143 ;
-       silc_client_command_register @ 144 ;
-       silc_client_command_unregister @ 145 ;
-       silc_client_commands_register @ 146 ;
-       silc_client_commands_unregister @ 147 ;
-       silc_client_command_call @ 148 ;
-       silc_client_command_reply_quit @ 149 ;
-       silc_client_run_one @ 150 ;
-       silc_client_on_channel @ 151 ;
-       silc_client_current_channel_private_key @ 152;
-        silc_client_attribute_add @ 153 ;
-        silc_client_attribute_del @ 154 ;
-        silc_client_attributes_get @ 155 ;
-        silc_client_attributes_request @ 156 ;
-       silc_client_get_channel_resolve @ 157 ;
-       silc_client_get_clients_by_channel @ 158 ;
-       silc_client_get_clients_whois @ 159 ;
-       silc_client_send_packet @ 160 ;
+EXPORTS\r
+       silc_client_listener_add @ 1 ;\r
+       silc_client_listener_free @ 2 ;\r
+       silc_client_listener_get_local_port @ 3 ;\r
+       silc_client_attribute_add @ 4 ;\r
+       silc_client_attribute_del @ 5 ;\r
+       silc_client_attributes_get @ 6 ;\r
+       silc_client_attributes_process @ 7 ;\r
+       silc_client_attributes_request @ 8 ;\r
+       silc_client_alloc @ 9 ;\r
+       silc_client_close_connection @ 10 ;\r
+       silc_client_connect_to_client @ 11 ;\r
+       silc_client_connect_to_server @ 12 ;\r
+       silc_client_free @ 13 ;\r
+       silc_client_init @ 14 ;\r
+       silc_client_key_exchange @ 15 ;\r
+       silc_client_run @ 16 ;\r
+       silc_client_run_one @ 17 ;\r
+       silc_client_get_channel @ 18 ;\r
+       silc_client_get_channel_by_id @ 19 ;\r
+       silc_client_get_channel_by_id_resolve @ 20 ;\r
+       silc_client_get_channel_resolve @ 21 ;\r
+       silc_client_get_client_by_id @ 22 ;\r
+       silc_client_get_client_by_id_resolve @ 23 ;\r
+       silc_client_get_clients @ 24 ;\r
+       silc_client_get_clients_local @ 25 ;\r
+       silc_client_get_clients_whois @ 26 ;\r
+       silc_client_get_server @ 27 ;\r
+       silc_client_get_server_by_id @ 28 ;\r
+       silc_client_get_server_by_id_resolve @ 29 ;\r
+       silc_client_list_free @ 30 ;\r
+       silc_client_list_free_channels @ 31 ;\r
+       silc_client_list_free_servers @ 32 ;\r
+       silc_client_lock_channel @ 33 ;\r
+       silc_client_lock_client @ 34 ;\r
+       silc_client_lock_server @ 35 ;\r
+       silc_client_nickname_format @ 36 ;\r
+       silc_client_nickname_parse @ 37 ;\r
+       silc_client_ref_channel @ 38 ;\r
+       silc_client_ref_client @ 39 ;\r
+       silc_client_ref_server @ 40 ;\r
+       silc_client_unlock_channel @ 41 ;\r
+       silc_client_unlock_client @ 42 ;\r
+       silc_client_unlock_server @ 43 ;\r
+       silc_client_unref_channel @ 44 ;\r
+       silc_client_unref_client @ 45 ;\r
+       silc_client_unref_server @ 46 ;\r
+       silc_client_perform_key_agreement @ 47 ;\r
+       silc_client_perform_key_agreement_stream @ 48 ;\r
+       silc_client_send_key_agreement @ 49 ;\r
+       silc_client_add_channel_private_key @ 50 ;\r
+       silc_client_current_channel_private_key @ 51 ;\r
+       silc_client_del_channel_private_key @ 52 ;\r
+       silc_client_del_channel_private_keys @ 53 ;\r
+       silc_client_list_channel_private_keys @ 54 ;\r
+       silc_client_on_channel @ 55 ;\r
+       silc_client_send_channel_message @ 56 ;\r
+       silc_client_file_close @ 57 ;\r
+       silc_client_file_receive @ 58 ;\r
+       silc_client_file_send @ 59 ;\r
+       silc_client_command_call @ 60 ;\r
+       silc_client_command_pending @ 61 ;\r
+       silc_client_command_send @ 62 ;\r
+       silc_client_add_private_message_key @ 63 ;\r
+       silc_client_add_private_message_key_ske @ 64 ;\r
+       silc_client_del_private_message_key @ 65 ;\r
+       silc_client_free_private_message_keys @ 66 ;\r
+       silc_client_list_private_message_keys @ 67 ;\r
+       silc_client_private_message_key_is_set @ 68 ;\r
+       silc_client_private_message_wait @ 69 ;\r
+       silc_client_private_message_wait_init @ 70 ;\r
+       silc_client_private_message_wait_uninit @ 71 ;\r
+       silc_client_send_private_message @ 72 ;\r
+       silc_client_set_away_message @ 73 ;\r