From f9f7346486f93750176ea1ff0af73de69864e7c6 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 31 Mar 2002 18:01:40 +0000 Subject: [PATCH] updates. --- TODO | 3 +++ TODO-1.0 | 7 +++++-- apps/irssi/src/silc/core/client_ops.c | 3 +++ doc/example_silcd.conf.in | 4 ++-- lib/silccore/silcpacket.c | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 4026ab4f..8b4f4ae8 100644 --- a/TODO +++ b/TODO @@ -190,3 +190,6 @@ describe new stuff to be added to protocol versions 1.x. Payload enforces that total of 256 arguments can be associated to a such payload. However, command-xx draft specified much higher values, and these should be fixed. + + 15. The LEAVE command reply should return the Channel ID of the channel + that was parted. diff --git a/TODO-1.0 b/TODO-1.0 index 4a0f6e2a..18e3e702 100644 --- a/TODO-1.0 +++ b/TODO-1.0 @@ -67,7 +67,7 @@ least could be done. These naturally cause the overal memory consumption to grow but would take away many allocations that can be done several - times in a second. + times in a second (see also ~/silcpacket). o Move the actual file descriptor task callback (the callback that handles the incoming data, outgoing data etc, that is implemnted @@ -122,7 +122,10 @@ least could be done. o Rewrite SilcProtocol to be SilcFSM (see ~/silcfsm). - o Do some scheduler optimizations (see ~/silcschedule). + o Do some scheduler optimizations and interface changes (see + ~/silcschedule). + + o Change the lib/silccore/silcpacket.[ch] interfaces (see ~/silcpacket). o Change SILC_TASK_CALLBACK to non-static, and remove the macro SILC_TASK_CALLBACK_GLOBAL. diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c index 16415900..14699048 100644 --- a/apps/irssi/src/silc/core/client_ops.c +++ b/apps/irssi/src/silc/core/client_ops.c @@ -619,6 +619,9 @@ void silc_disconnect(SilcClient client, SilcClientConnection conn) SILC_LOG_DEBUG(("Start")); + if (!server || server->connection_lost) + return; + if (server->conn && server->conn->local_entry) { nicklist_rename_unique(SERVER(server), server->conn->local_entry, server->nick, diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in index bf0a81b4..bf7db76b 100644 --- a/doc/example_silcd.conf.in +++ b/doc/example_silcd.conf.in @@ -63,7 +63,7 @@ General { # remote must be of at least this version, or newer. If older then # the connection will not be allowed. # - # version_protocol - SILC protocol version ("majog.minor") + # version_protocol - SILC protocol version ("major.minor") # version_software - software version ("major.minor") # version_software_vendor - vendor specific version extension # @@ -105,7 +105,7 @@ General { # Key exchange protocol rekey interval (seconds). How often to # regenerate the session key with the remote. Initiator will perform - # the rekey and this setting affects only when connecting as intiator. + # the rekey and this setting affects only when connecting as initiator. # This can be overridden with ConnectionParams. #key_exchange_rekey = 3600; diff --git a/lib/silccore/silcpacket.c b/lib/silccore/silcpacket.c index 89aae80b..56312006 100644 --- a/lib/silccore/silcpacket.c +++ b/lib/silccore/silcpacket.c @@ -629,7 +629,7 @@ SilcPacketType silc_packet_parse(SilcPacketContext *ctx, SilcCipher cipher) return SILC_PACKET_NONE; if (src_id_type > SILC_ID_CHANNEL || dst_id_type > SILC_ID_CHANNEL) { - SILC_LOG_ERROR(("Bad ID types in packet (%d and %d", + SILC_LOG_ERROR(("Bad ID types in packet (%d and %d)", src_id_type, dst_id_type)); return SILC_PACKET_NONE; } @@ -714,7 +714,7 @@ SilcPacketType silc_packet_parse_special(SilcPacketContext *ctx, } if (src_id_type > SILC_ID_CHANNEL || dst_id_type > SILC_ID_CHANNEL) { - SILC_LOG_ERROR(("Bad ID types in packet (%d and %d", + SILC_LOG_ERROR(("Bad ID types in packet (%d and %d)", src_id_type, dst_id_type)); return SILC_PACKET_NONE; } -- 2.24.0