From 2407b5a8d55101dcc4cccb098888e0e21f6f299c Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 30 Jan 2002 15:07:14 +0000 Subject: [PATCH] updates --- apps/silcd/command.c | 6 +++- apps/silcd/server.c | 3 -- apps/silcd/server_internal.h | 5 --- win32/libsilc/libsilc.def | 65 ------------------------------------ 4 files changed, 5 insertions(+), 74 deletions(-) diff --git a/apps/silcd/command.c b/apps/silcd/command.c index e5a29e47..9ceb7caa 100644 --- a/apps/silcd/command.c +++ b/apps/silcd/command.c @@ -131,7 +131,6 @@ static int silc_server_is_registered(SilcServer server, silc_server_command_send_status_reply(cmd, command, SILC_STATUS_ERR_NOT_REGISTERED); - silc_server_command_free(cmd); return FALSE; } @@ -149,6 +148,11 @@ SILC_TASK_CALLBACK(silc_server_command_process_timeout) SilcServerCommandTimeout timeout = (SilcServerCommandTimeout)context; SilcClientEntry client = (SilcClientEntry)timeout->ctx->sock->user_data; + if (!client) { + silc_server_command_free(timeout->ctx); + silc_free(timeout); + } + /* Update access time */ client->last_command = time(NULL); diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 409a8afc..b3914316 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -163,9 +163,6 @@ int silc_server_init(SilcServer server) silc_hash_alloc("md5", &server->md5hash); silc_hash_alloc("sha1", &server->sha1hash); - /* Initialize none cipher */ - silc_cipher_alloc("none", &server->none_cipher); - /* Allocate PKCS context for local public and private keys */ silc_pkcs_alloc(server->public_key->name, &server->pkcs); silc_pkcs_public_key_set(server->pkcs, server->public_key); diff --git a/apps/silcd/server_internal.h b/apps/silcd/server_internal.h index e50340b8..41df9ab8 100644 --- a/apps/silcd/server_internal.h +++ b/apps/silcd/server_internal.h @@ -96,11 +96,6 @@ struct SilcServerStruct { /* Table of connected sockets */ SilcSocketConnection *sockets; - /* Server keys */ - SilcCipher send_key; - SilcCipher receive_key; - SilcCipher none_cipher; - /* Server public key */ SilcPKCS pkcs; SilcPublicKey public_key; diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def index a0850dd9..42d54f0d 100644 --- a/win32/libsilc/libsilc.def +++ b/win32/libsilc/libsilc.def @@ -496,71 +496,6 @@ 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 ; -- 2.24.0