From 02c601db4704a84433b2f56c2292a2d765a02080 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 30 Jan 2002 09:17:04 +0000 Subject: [PATCH] updates --- CHANGES | 7 +++ apps/silcd/command.c | 7 +-- win32/libsilc/libsilc.def | 86 +++++++++++++++++++++++---- win32/libsilcclient/libsilcclient.def | 1 + 4 files changed, 85 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index e8da703f..14f2f245 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Wed Jan 30 11:11:47 CET 2002 Pekka Riikonen + + * When sending JOIN command to router for processing the + sender's old command identifier was not saved back to the + sender's command context, fixed now. The affected file is + silcd/command.c. + Tue Jan 29 19:49:31 EET 2002 Pekka Riikonen * Applied patches from cras: diff --git a/apps/silcd/command.c b/apps/silcd/command.c index b0f3f98f..cf35efe6 100644 --- a/apps/silcd/command.c +++ b/apps/silcd/command.c @@ -1061,7 +1061,6 @@ silc_server_command_whowas_check(SilcServerCommandContext cmd, silc_server_command_whowas, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); @@ -1195,7 +1194,6 @@ silc_server_command_whowas_process(SilcServerCommandContext cmd) silc_server_command_whowas, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); @@ -3393,6 +3391,7 @@ SILC_SERVER_CMD_FUNC(join) silc_server_command_join, silc_server_command_dup(cmd)); cmd->pending = TRUE; + silc_command_set_ident(cmd->payload, old_ident); goto out; } @@ -3456,7 +3455,8 @@ SILC_SERVER_CMD_FUNC(join) if (silc_command_get(reply->payload) == SILC_COMMAND_JOIN) { tmp = silc_argument_get_arg_type(reply->args, 6, NULL); SILC_GET32_MSB(created, tmp); - create_key = FALSE; /* Router returned the key already */ + if (silc_argument_get_arg_type(reply->args, 7, NULL) + create_key = FALSE; /* Router returned the key already */ } if (silc_command_get(reply->payload) == SILC_COMMAND_WHOIS && @@ -5362,7 +5362,6 @@ SILC_SERVER_CMD_FUNC(getkey) silc_server_command_getkey, silc_server_command_dup(cmd)); cmd->pending = TRUE; - silc_command_set_ident(cmd->payload, old_ident); silc_buffer_free(tmpbuf); goto out; diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def index 43b1b2d9..a0850dd9 100644 --- a/win32/libsilc/libsilc.def +++ b/win32/libsilc/libsilc.def @@ -15,14 +15,6 @@ ; compatiblity. -Pekka ; EXPORTS - log_error_file @ 42 ; - log_error_size @ 43 ; - log_fatal_file @ 44 ; - log_fatal_size @ 45 ; - log_info_file @ 46 ; - log_info_size @ 47 ; - log_warning_file @ 49 ; - log_warning_size @ 50 ; silc_aes_context_len @ 235 ; silc_aes_decrypt_cbc @ 236 ; silc_aes_encrypt_cbc @ 237 ; @@ -69,7 +61,7 @@ EXPORTS silc_channel_key_payload_encode @ 278 ; silc_channel_key_payload_free @ 279 ; silc_channel_key_payload_parse @ 280 ; - silc_channel_mesage_get_mac @ 281 ; + silc_channel_message_get_mac @ 281 ; silc_channel_message_get_data @ 282 ; silc_channel_message_get_flags @ 283 ; silc_channel_message_get_iv @ 284 ; @@ -230,10 +222,9 @@ EXPORTS silc_log_output_hexdump @ 441 ; silc_log_reset_callbacks @ 442 ; silc_log_reset_debug_callbacks @ 443 ; - silc_log_set_callbacks @ 444 ; + silc_log_set_callback @ 444 ; silc_log_set_debug_callbacks @ 445 ; - silc_log_set_files @ 446 ; - silc_log_types @ 447 ; + silc_log_set_file @ 446 ; silc_malloc @ 448 ; silc_mars_context_len @ 449 ; silc_mars_decrypt_cbc @ 450 ; @@ -505,6 +496,71 @@ EXPORTS silc_twofish_encrypt_cbc @ 718 ; silc_twofish_set_key @ 719 ; silc_twofish_set_key_with_string @ 720 ; + trq_deque_bubblesort @ 724 ; + trq_deque_clear___func @ 725 ; + trq_deque_compatible___func @ 726 ; + trq_deque_empty_p___func @ 727 ; + trq_deque_find @ 728 ; + trq_deque_get_head___func @ 729 ; + trq_deque_get_nth @ 730 ; + trq_deque_get_tail___func @ 731 ; + trq_deque_in_order @ 732 ; + trq_deque_init_with_offset___func @ 733 ; + trq_deque_insert_head___func @ 734 ; + trq_deque_insert_in_order @ 735 ; + trq_deque_insert_nth @ 736 ; + trq_deque_insert_tail___func @ 737 ; + trq_deque_insertionsort @ 738 ; + trq_deque_join_head @ 739 ; + trq_deque_join_tail @ 740 ; + trq_deque_length___func @ 741 ; + trq_deque_mapcar @ 742 ; + trq_deque_mapcar_reverse @ 743 ; + trq_deque_member @ 744 ; + trq_deque_mergesort @ 745 ; + trq_deque_quicksort @ 746 ; + trq_deque_remove @ 747 ; + trq_deque_reverse___func @ 748 ; + trq_deque_swap @ 749 ; + trq_deque_to_list @ 750 ; + trq_list_bubblesort @ 751 ; + trq_list_bw @ 752 ; + trq_list_clear___func @ 753 ; + trq_list_compatible___func @ 754 ; + trq_list_current___func @ 755 ; + trq_list_end___func @ 756 ; + trq_list_find @ 757 ; + trq_list_fw @ 758 ; + trq_list_get_bw___func @ 759 ; + trq_list_get_fw___func @ 760 ; + trq_list_get_head___func @ 761 ; + trq_list_get_nth @ 762 ; + trq_list_get_tail___func @ 763 ; + trq_list_in_order @ 764 ; + trq_list_insert_head___func @ 765 ; + trq_list_insert_in_order @ 766 ; + trq_list_insert_nth @ 767 ; + trq_list_insert_tail___func @ 768 ; + trq_list_insertionsort @ 769 ; + trq_list_join_head @ 770 ; + trq_list_join_tail @ 771 ; + trq_list_length___func @ 772 ; + trq_list_mapcar @ 773 ; + trq_list_mapcar_reverse @ 774 ; + trq_list_member @ 775 ; + trq_list_mergesort @ 776 ; + trq_list_pointer_invalidate___func @ 777 ; + trq_list_pointer_valid___func @ 778 ; + trq_list_put_after___func @ 779 ; + trq_list_put_before___func @ 780 ; + trq_list_quicksort @ 781 ; + trq_list_remove___func @ 782 ; + trq_list_reverse @ 783 ; + trq_list_rewind___func @ 784 ; + trq_list_rewind_find @ 785 ; + trq_list_rewind_to @ 786 ; + trq_list_swap @ 787 ; + trq_list_to_deque @ 788 ; silc_buffer_format_vp @ 789 ; silc_buffer_unformat_vp @ 790 ; silc_sftp_client_start @ 791 ; @@ -558,3 +614,9 @@ EXPORTS silc_net_gethostbyaddr_async @ 840 ; silc_net_is_ip4 @ 841 ; silc_net_is_ip6 @ 842 ; + silc_log_set_debug_string @ 843 ; + silc_log_reset_all @ 844 ; + silc_log_flush_all @ 845 ; + silc_log_get_file @ 846 ; + silc_log_quick @ 847 ; + silc_log_flushdelay @ 848 ; diff --git a/win32/libsilcclient/libsilcclient.def b/win32/libsilcclient/libsilcclient.def index 0c0915a9..7bec0254 100644 --- a/win32/libsilcclient/libsilcclient.def +++ b/win32/libsilcclient/libsilcclient.def @@ -161,3 +161,4 @@ EXPORTS silc_client_commands_unregister @ 147 ; silc_client_command_call @ 148 ; silc_client_command_reply_quit @ 149 ; + silc_client_run_one @ 150 ; -- 2.24.0