From: Pekka Riikonen Date: Tue, 18 Sep 2001 20:15:17 +0000 (+0000) Subject: updates. X-Git-Tag: silcertest~102 X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=23308d2b819b6274fe0d02d4751ec7493202e937;p=silc.git updates. --- diff --git a/CHANGES b/CHANGES index bcd3fb84..c02b602f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +Tue Sep 18 22:50:41 EEST 2001 Pekka Riikonen + + * Do not show the private channels on the WHOIS channel list + as it is not allowed by the protocol. The affected file is + silcd/server.c. + Sun Sep 16 12:32:58 EEST 2001 Pekka Riikonen * Assure that the packet length digged from the actual packet diff --git a/TODO b/TODO index 244d257e..6ff015e3 100644 --- a/TODO +++ b/TODO @@ -44,9 +44,6 @@ TODO/bugs In SILC Client Library TODO/bugs In SILC Server ======================== - o Private channels are shown on the USERS channel list. They must not - be shown. - o Add perhaps /var/run/silcd.pid for PID information for the server. o Add a timeout to handling incmoing JOIN commands. It should be diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 5c93bed5..f3022c2d 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -3905,7 +3905,8 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server, while (silc_hash_table_get(&htl, NULL, (void *)&chl)) { channel = chl->channel; - if (channel->mode & SILC_CHANNEL_MODE_SECRET) + if (channel->mode & SILC_CHANNEL_MODE_SECRET || + channel->mode & SILC_CHANNEL_MODE_PRIVATE) continue; cid = silc_id_id2str(channel->id, SILC_ID_CHANNEL); @@ -4028,7 +4029,7 @@ SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final) SILC_LOG_DEBUG(("Start")); if (protocol->state == SILC_PROTOCOL_STATE_ERROR || - protocol->state == SILC_PROTOCOL_STATE_FAILURE) { + protocol->state == SILC_PROTOCOL_STATE_FAILURE) { /* Error occured during protocol */ silc_protocol_cancel(protocol, server->schedule); silc_protocol_free(protocol);