Merge commit 'origin/silc.1.1.branch'
[silc.git] / apps / irssi / src / silc / core / silc-channels.c
index 3f99c37dce6e13d22871b5a22a137a5dcfb986b7..4bd4e49ef556fb0d8a464fb930f8f014028eafa7 100644 (file)
@@ -1,19 +1,19 @@
 /*
   silc-channels.c : irssi
 
-  Copyright (C) 2000 - 2001 Timo Sirainen
-                            Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Copyright (C) 2000 - 2001, 2004, 2006, 2007 Timo Sirainen
+                Pekka Riikonen <priikone@silcnet.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "silc-channels.h"
 #include "silc-queries.h"
 #include "silc-nicklist.h"
+#include "silc-cmdqueue.h"
 #include "window-item-def.h"
 
 #include "fe-common/core/printtext.h"
+#include "fe-common/silc/module-formats.h"
+
+#include "silc-commands.h"
+
+void sig_mime(SILC_SERVER_REC *server, SILC_CHANNEL_REC *channel,
+             const char *blob, const char *nick, int verified)
+{
+  unsigned char *message;
+  SilcUInt32 message_len;
+  SilcMime mime;
+
+  if (!(IS_SILC_SERVER(server)))
+    return;
+
+  message = silc_unescape_data(blob, &message_len);
+
+  mime = silc_mime_decode(NULL, message, message_len);
+  if (!mime) {
+    silc_free(message);
+    return;
+  }
+
+  printformat_module("fe-common/silc", server,
+                    channel == NULL ? NULL : channel->name,
+                    MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+                    nick == NULL ? "[<unknown>]" : nick,
+                    silc_mime_get_field(mime, "Content-Type"));
+
+  silc_free(message);
+  silc_mime_free(mime);
+}
 
 SILC_CHANNEL_REC *silc_channel_create(SILC_SERVER_REC *server,
-                                     const char *name, int automatic)
+                                     const char *name,
+                                     const char *visible_name,
+                                     int automatic)
 {
   SILC_CHANNEL_REC *rec;
 
@@ -52,10 +86,8 @@ SILC_CHANNEL_REC *silc_channel_create(SILC_SERVER_REC *server,
 
   rec = g_new0(SILC_CHANNEL_REC, 1);
   rec->chat_type = SILC_PROTOCOL;
-  rec->name = g_strdup(name);
-  rec->server = server;
-
-  channel_init((CHANNEL_REC *) rec, automatic);
+  channel_init((CHANNEL_REC *)rec, (SERVER_REC *)server, name, name,
+              automatic);
   return rec;
 }
 
@@ -63,27 +95,54 @@ static void sig_channel_destroyed(SILC_CHANNEL_REC *channel)
 {
   if (!IS_SILC_CHANNEL(channel))
     return;
+  if (channel->server && channel->server->disconnected)
+    return;
 
   if (channel->server != NULL && !channel->left && !channel->kicked) {
     /* destroying channel record without actually
        having left the channel yet */
-    silc_command_exec(channel->server, "PART", channel->name);
+    silc_command_exec(channel->server, "LEAVE", channel->name);
+    /* enable queueing because we destroy the channel immedially */
+    silc_queue_enable(channel->server->conn);
   }
 }
 
 static void silc_channels_join(SILC_SERVER_REC *server,
                               const char *channels, int automatic)
 {
-  char **list, **tmp, *channel;
+  char **list, **tmp;
+  char *channel, *key;
+  SILC_CHANNEL_REC *chanrec;
+  CHANNEL_SETUP_REC *schannel;
+  GString *tmpstr;
 
   list = g_strsplit(channels, ",", -1);
   for (tmp = list; *tmp != NULL; tmp++) {
-    channel = **tmp == '#' ? g_strdup(*tmp) :
-      g_strconcat("#", *tmp, NULL);
-    silc_channel_create(server, channel, FALSE);
-    silc_command_exec(server, "JOIN", channel);
-    g_free(channel);
+    chanrec = silc_channel_find(server, *tmp);
+    if (chanrec)
+      continue;
+
+    channel = *tmp;
+    key = strchr(channel, ' ');
+    if (key != NULL) {
+      *key = '\0';
+      key++;
+    }
+    tmpstr = g_string_new(NULL);
+
+    schannel = channel_setup_find(channel, server->connrec->chatnet);
+    if (key && *key != '\0')
+      g_string_sprintfa(tmpstr, "%s %s", channel, key);
+    else if (schannel && schannel->password && schannel->password[0] != '\0')
+      g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password);
+    else
+      g_string_sprintfa(tmpstr, "%s", channel);
+
+
+    silc_command_exec(server, "JOIN", tmpstr->str);
+    g_string_free(tmpstr, FALSE);
   }
+
   g_strfreev(list);
 }
 
@@ -98,13 +157,11 @@ static void sig_connected(SILC_SERVER_REC *server)
 
 static void sig_server_quit(SILC_SERVER_REC *server, const char *msg)
 {
-  if (IS_SILC_SERVER(server))
+  if (IS_SILC_SERVER(server) && server->conn)
     silc_command_exec(server, "QUIT", msg);
 }
 
-/*
- * "event join". Joined to a channel.
- */
+/* Find Irssi channel entry by SILC channel entry */
 
 SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
                                          SilcChannelEntry entry)
@@ -123,395 +180,1080 @@ SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
   return NULL;
 }
 
-static void event_join(SILC_SERVER_REC *server, va_list va)
+/* PART (LEAVE) command. */
+
+static void command_part(const char *data, SILC_SERVER_REC *server,
+                        WI_ITEM_REC *item)
 {
   SILC_CHANNEL_REC *chanrec;
-  SILC_NICK_REC *nickrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-
-  client = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-
-  if (client == server->conn->local_entry) {
-    /* You joined to channel */
-    chanrec = silc_channel_find(server, channel->channel_name);
-    if (chanrec != NULL && !chanrec->joined)
-      chanrec->entry = channel;
-  } else {
-    chanrec = silc_channel_find_entry(server, channel);
-    if (chanrec != NULL) {
-      SilcChannelUser user;
-
-      silc_list_start(chanrec->entry->clients);
-      while ((user = silc_list_get(chanrec->entry->clients)) != NULL)
-       if (user->client == client) {
-         nickrec = silc_nicklist_insert(chanrec, user, TRUE);
-         break;
-       }
-    }
-  }
+  char userhost[256];
 
-  signal_emit("message join", 4, server, channel->channel_name,
-             client->nickname,
-             client->username == NULL ? "" : client->username);
-}
+  CMD_SILC_SERVER(server);
 
-/*
- * "event leave". Left a channel.
- */
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    cmd_return_error(CMDERR_NOT_CONNECTED);
 
-static void event_leave(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SILC_NICK_REC *nickrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-
-  client = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-
-  signal_emit("message part", 5, server, channel->channel_name,
-             client->nickname,  client->username ?  client->username : "", 
-             client->nickname);
-
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    nickrec = silc_nicklist_find(chanrec, client);
-    if (nickrec != NULL)
-      nicklist_remove(CHANNEL(chanrec), NICK(nickrec));
+  if (!strcmp(data, "*") || *data == '\0') {
+    if (!IS_SILC_CHANNEL(item))
+      cmd_return_error(CMDERR_NOT_JOINED);
+    data = item->visible_name;
   }
-}
 
-/*
- * "event signoff". Left the network.
- */
+  chanrec = silc_channel_find(server, data);
+  if (chanrec == NULL)
+    cmd_return_error(CMDERR_CHAN_NOT_FOUND);
 
-static void event_signoff(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry client;
-  GSList *nicks, *tmp;
-  char *message;
-
-  client = va_arg(va, SilcClientEntry);
-  message = va_arg(va, char *);
-
-  signal_emit("message quit", 4, server, client->nickname,
-             client->username ? client->username : "", 
-             message ? message : "");
-
-  nicks = nicklist_get_same_unique(SERVER(server), client);
-  for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
-    CHANNEL_REC *channel = tmp->data;
-    NICK_REC *nickrec = tmp->next->data;
-    
-    nicklist_remove(channel, nickrec);
-  }
+  memset(userhost, 0, sizeof(userhost));
+  snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
+          server->conn->local_entry->username,
+          server->conn->local_entry->hostname);
+  signal_emit("message part", 5, server, chanrec->name,
+             server->nick, userhost, "");
+
+  chanrec->left = TRUE;
+  silc_command_exec(server, "LEAVE", chanrec->name);
+  /* enable queueing because we destroy the channel immedially */
+  silc_queue_enable(server->conn);
+  signal_stop();
+
+  channel_destroy(CHANNEL(chanrec));
 }
 
-/*
- * "event topic". Changed topic.
- */
 
-static void event_topic(SILC_SERVER_REC *server, va_list va)
+/* ACTION local command. */
+
+static void command_action(const char *data, SILC_SERVER_REC *server,
+                          WI_ITEM_REC *item)
 {
-  SILC_CHANNEL_REC *chanrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char *topic;
-
-  client = va_arg(va, SilcClientEntry);
-  topic = va_arg(va, char *);
-  channel = va_arg(va, SilcChannelEntry);
-
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    g_free_not_null(chanrec->topic);
-    chanrec->topic = *topic == '\0' ? NULL : g_strdup(topic);
-    signal_emit("channel topic changed", 1, chanrec);
+  GHashTable *optlist;
+  char *target, *msg;
+  char *message = NULL;
+  int target_type;
+  void *free_arg;
+  SilcBool sign = FALSE;
+
+  CMD_SILC_SERVER(server);
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    cmd_return_error(CMDERR_NOT_CONNECTED);
+
+  if ((item != NULL) && (!IS_SILC_CHANNEL(item) && !IS_SILC_QUERY(item)))
+    cmd_return_error(CMDERR_NOT_JOINED);
+
+  /* Now parse all arguments */
+  if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
+                     PARAM_FLAG_GETREST,
+                     "action", &optlist, &target, &msg))
+    return;
+
+  if (*target == '\0' || *msg == '\0')
+    cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+  if (strcmp(target, "*") == 0) {
+    /* send to active channel/query */
+    if (item == NULL)
+      cmd_param_error(CMDERR_NOT_JOINED);
+
+    target_type = IS_SILC_CHANNEL(item) ?
+           SEND_TARGET_CHANNEL : SEND_TARGET_NICK;
+    target = (char *)window_item_get_target(item);
+  } else if (g_hash_table_lookup(optlist, "channel") != NULL)
+    target_type = SEND_TARGET_CHANNEL;
+  else {
+    target_type = SEND_TARGET_NICK;
   }
 
-  signal_emit("message topic", 5, server, channel->channel_name,
-             topic, client->nickname, client->username);
-}
+  if (!silc_term_utf8()) {
+    int len = silc_utf8_encoded_len(msg, strlen(msg),
+                                   SILC_STRING_LOCALE);
+    message = silc_calloc(len + 1, sizeof(*message));
+    g_return_if_fail(message != NULL);
+    silc_utf8_encode(msg, strlen(msg), SILC_STRING_LOCALE,
+                    message, len);
+  }
 
-/*
- * "event invite". Invited or modified invite list.
- */
+  if (target != NULL) {
+    if (target_type == SEND_TARGET_CHANNEL) {
+      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
+             settings_get_bool("sign_channel_messages") ? TRUE : FALSE);
+      if (silc_send_channel(server, target, (message != NULL ? message : msg),
+                           SILC_MESSAGE_FLAG_ACTION | SILC_MESSAGE_FLAG_UTF8 |
+                           (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+       if (g_hash_table_lookup(optlist, "sign"))
+          signal_emit("message silc signed_own_action", 3, server, msg, target);
+       else
+          signal_emit("message silc own_action", 3, server, msg, target);
+      }
+    } else {
+      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
+             settings_get_bool("sign_private_messages") ? TRUE : FALSE);
+      if (silc_send_msg(server, target, (message != NULL ? message : msg),
+                       (message != NULL ? strlen(message) : strlen(msg)),
+                       SILC_MESSAGE_FLAG_ACTION | SILC_MESSAGE_FLAG_UTF8 |
+                       (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+       if (g_hash_table_lookup(optlist, "sign"))
+         signal_emit("message silc signed_own_private_action", 3,
+                         server, msg, target);
+       else
+         signal_emit("message silc own_private_action", 3,
+                         server, msg, target);
+      }
+    }
+  }
 
-static void event_invite(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  
-  client = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-
-  signal_emit("message invite", 4, server, channel->channel_name,
-             client->nickname, client->username);
+  cmd_params_free(free_arg);
+  silc_free(message);
 }
 
-/*
- * "event nick". Changed nickname.
- */
+/* ME local command. */
 
-static void event_nick(SILC_SERVER_REC *server, va_list va)
+static void command_me(const char *data, SILC_SERVER_REC *server,
+                      WI_ITEM_REC *item)
 {
-  SilcClientEntry oldclient, newclient;
+  char *tmpcmd;
 
-  oldclient = va_arg(va, SilcClientEntry);
-  newclient = va_arg(va, SilcClientEntry);
+  CMD_SILC_SERVER(server);
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    cmd_return_error(CMDERR_NOT_CONNECTED);
 
-  nicklist_rename_unique(SERVER(server),
-                        oldclient, oldclient->nickname,
-                        newclient, newclient->nickname);
+  if (!IS_SILC_CHANNEL(item) && !IS_SILC_QUERY(item))
+    cmd_return_error(CMDERR_NOT_JOINED);
+
+  if (IS_SILC_CHANNEL(item))
+    tmpcmd = g_strdup_printf("-channel %s %s", item->visible_name, data);
+  else
+    tmpcmd = g_strdup_printf("%s %s", item->visible_name, data);
 
-  signal_emit("message nick", 4, server, newclient->nickname, 
-             oldclient->nickname, newclient->username);
+  command_action(tmpcmd, server, item);
+  g_free(tmpcmd);
 }
 
-/*
- * "event cmode". Changed channel mode.
- */
+/* NOTICE local command. */
 
-static void event_cmode(SILC_SERVER_REC *server, va_list va)
+static void command_notice(const char *data, SILC_SERVER_REC *server,
+                          WI_ITEM_REC *item)
 {
-  SILC_CHANNEL_REC *chanrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char *mode;
-  uint32 modei;
-
-  client = va_arg(va, SilcClientEntry);
-  modei = va_arg(va, uint32);
-  channel = va_arg(va, SilcChannelEntry);
-  mode = silc_client_chmode(modei, channel);
-  
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    g_free_not_null(chanrec->mode);
-    chanrec->mode = g_strdup(mode == NULL ? "" : mode);
-    signal_emit("channel mode changed", 1, chanrec);
+  GHashTable *optlist;
+  char *target, *msg;
+  char *message = NULL;
+  int target_type;
+  void *free_arg;
+  SilcBool sign;
+
+  CMD_SILC_SERVER(server);
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    cmd_return_error(CMDERR_NOT_CONNECTED);
+
+  if ((item != NULL) && (!IS_SILC_CHANNEL(item) && !IS_SILC_QUERY(item)))
+    cmd_return_error(CMDERR_NOT_JOINED);
+
+  /* Now parse all arguments */
+  if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
+                     PARAM_FLAG_GETREST,
+                     "notice", &optlist, &target, &msg))
+    return;
+
+  if (*target == '\0' || *msg == '\0')
+    cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+  if (strcmp(target, "*") == 0) {
+    /* send to active channel/query */
+    if (item == NULL)
+      cmd_param_error(CMDERR_NOT_JOINED);
+
+    target_type = IS_SILC_CHANNEL(item) ?
+           SEND_TARGET_CHANNEL : SEND_TARGET_NICK;
+    target = (char *)window_item_get_target(item);
+  } else if (g_hash_table_lookup(optlist, "channel") != NULL)
+    target_type = SEND_TARGET_CHANNEL;
+  else {
+    target_type = SEND_TARGET_NICK;
   }
-  
-  printtext(server, channel->channel_name, MSGLEVEL_MODES,
-           "cmode/%s [%s] by %s", channel->channel_name, mode,
-           client->nickname);
-  
-  g_free(mode);
-}
 
-/*
- * "event cumode". Changed user's mode on channel.
- */
+  if (!silc_term_utf8()) {
+    int len = silc_utf8_encoded_len(msg, strlen(msg),
+                                   SILC_STRING_LOCALE);
+    message = silc_calloc(len + 1, sizeof(*message));
+    g_return_if_fail(message != NULL);
+    silc_utf8_encode(msg, strlen(msg), SILC_STRING_LOCALE,
+                    message, len);
+  }
 
-static void event_cumode(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SilcClientEntry client, destclient;
-  SilcChannelEntry channel;
-  int mode;
-  char *modestr;
-  
-  client = va_arg(va, SilcClientEntry);
-  mode = va_arg(va, uint32);
-  destclient = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-  
-  modestr = silc_client_chumode(mode);
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    SILC_NICK_REC *nick;
-    
-    if (destclient == server->conn->local_entry) {
-      chanrec->chanop =
-       (mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
-    }
-    
-    nick = silc_nicklist_find(chanrec, destclient);
-    if (nick != NULL) {
-      nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
-      signal_emit("nick mode changed", 2, chanrec, nick);
+  if (target != NULL) {
+    if (target_type == SEND_TARGET_CHANNEL) {
+      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
+             settings_get_bool("sign_channel_messages") ? TRUE : FALSE);
+      if (silc_send_channel(server, target, (message != NULL ? message : msg),
+                           SILC_MESSAGE_FLAG_NOTICE | SILC_MESSAGE_FLAG_UTF8 |
+                           (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+       if (g_hash_table_lookup(optlist, "sign"))
+          signal_emit("message silc signed_own_notice", 3, server, msg, target);
+       else
+          signal_emit("message silc own_notice", 3, server, msg, target);
+      }
+    } else {
+      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
+             settings_get_bool("sign_private_messages") ? TRUE : FALSE);
+      if (silc_send_msg(server, target, (message != NULL ? message : msg),
+                       (message != NULL ? strlen(message) : strlen(msg)),
+                       SILC_MESSAGE_FLAG_NOTICE | SILC_MESSAGE_FLAG_UTF8 |
+                       (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+       if (g_hash_table_lookup(optlist, "sign"))
+         signal_emit("message silc signed_own_private_notice", 3,
+                         server, msg, target);
+       else
+         signal_emit("message silc own_private_notice", 3,
+                         server, msg, target);
+      }
     }
   }
-  
-  printtext(server, channel->channel_name, MSGLEVEL_MODES,
-           "cumode/%s/%s [%s] by %s", destclient->nickname, 
-           channel->channel_name, modestr, client->nickname);
-  
-  g_free(modestr);
+
+  cmd_params_free(free_arg);
+  silc_free(message);
 }
 
-/*
- * "event motd". Received MOTD.
- */
+/* AWAY local command.  Sends UMODE command that sets the SILC_UMODE_GONE
+   flag. */
 
-static void event_motd(SILC_SERVER_REC *server, va_list va)
+bool silc_set_away(const char *reason, SILC_SERVER_REC *server)
 {
-  char *text = va_arg(va, char *);
+  bool set;
 
-  if (!settings_get_bool("skip_motd"))
-    printtext_multiline(server, NULL, MSGLEVEL_CRAP, "%s", text);
-}
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    return FALSE;
 
-/*
- * "event channel_change". Channel ID has changed.
- */
+  if (*reason == '\0') {
+    /* Remove any possible away message */
+    silc_client_set_away_message(silc_client, server->conn, NULL);
+    set = FALSE;
 
-static void event_channel_change(SILC_SERVER_REC *server, va_list va)
-{
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_UNSET_AWAY);
+  } else {
+    /* Set the away message */
+    silc_client_set_away_message(silc_client, server->conn, (char *)reason);
+    set = TRUE;
 
-}
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_SET_AWAY, reason);
+  }
 
-/*
- * "event server_signoff". Server has quit the network.
- */
+  server->usermode_away = set;
+  g_free_and_null(server->away_reason);
+  if (set)
+    server->away_reason = g_strdup((char *)reason);
 
-static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
-{
+  signal_emit("away mode changed", 1, server);
 
+  return set;
 }
 
-/*
- * "event kick". Someone was kicked from channel.
- */
-
-static void event_kick(SILC_SERVER_REC *server, va_list va)
+static void command_away(const char *data, SILC_SERVER_REC *server,
+                        WI_ITEM_REC *item)
 {
+  CMD_SILC_SERVER(server);
 
-}
-
-/*
- * "event kill". Someone was killed from the network.
- */
+  if (!IS_SILC_SERVER(server) || !server->connected)
+    cmd_return_error(CMDERR_NOT_CONNECTED);
 
-static void event_kill(SILC_SERVER_REC *server, va_list va)
-{
+  g_free_and_null(server->away_reason);
+  if ((data) && (*data != '\0'))
+    server->away_reason = g_strdup(data);
 
+  silc_command_exec(server, "UMODE",
+                   (server->away_reason != NULL) ? "+g" : "-g");
 }
 
-/*
- * "event ban". Someone was banned or ban list was modified.
- */
-
-static void event_ban(SILC_SERVER_REC *server, va_list va)
+typedef struct {
+  SILC_SERVER_REC *server;
+  int type;                    /* 1 = msg, 2 = channel */
+  SilcBool responder;
+} *KeyInternal;
+
+/* Key agreement callback that is called after the key agreement protocol
+   has been performed. This is called also if error occured during the
+   key agreement protocol. The `key' is the allocated key material and
+   the caller is responsible of freeing it. The `key' is NULL if error
+   has occured. The application can freely use the `key' to whatever
+   purpose it needs. See lib/silcske/silcske.h for the definition of
+   the SilcSKEKeyMaterial structure. */
+
+static void keyagr_completion(SilcClient client,
+                             SilcClientConnection conn,
+                             SilcClientEntry client_entry,
+                             SilcKeyAgreementStatus status,
+                             SilcSKEKeyMaterial key,
+                             void *context)
 {
+  KeyInternal i = (KeyInternal)context;
+
+  switch(status) {
+  case SILC_KEY_AGREEMENT_OK:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_OK, client_entry->nickname);
+
+    if (i->type == 1) {
+      /* Set the private key for this client */
+      silc_client_del_private_message_key(client, conn, client_entry);
+      silc_client_add_private_message_key_ske(client, conn, client_entry,
+                                             NULL, NULL, key);
+      printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                        SILCTXT_KEY_AGREEMENT_PRIVMSG,
+                        client_entry->nickname);
+      silc_ske_free_key_material(key);
+    }
 
-}
+    break;
+
+  case SILC_KEY_AGREEMENT_ERROR:
+  case SILC_KEY_AGREEMENT_NO_MEMORY:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_ERROR, client_entry->nickname);
+    break;
+
+  case SILC_KEY_AGREEMENT_FAILURE:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_FAILURE, client_entry->nickname);
+    break;
+
+  case SILC_KEY_AGREEMENT_TIMEOUT:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_TIMEOUT, client_entry->nickname);
+    break;
+
+  case SILC_KEY_AGREEMENT_ABORTED:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_ABORTED, client_entry->nickname);
+    break;
+
+  case SILC_KEY_AGREEMENT_ALREADY_STARTED:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_ALREADY_STARTED,
+                      client_entry->nickname);
+    break;
+
+  case SILC_KEY_AGREEMENT_SELF_DENIED:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_SELF_DENIED);
+    break;
+
+  default:
+    break;
+  }
 
-/* PART (LEAVE) command. */
+  if (i)
+    silc_free(i);
+}
 
-static void command_part(const char *data, SILC_SERVER_REC *server,
-                        WI_ITEM_REC *item)
+/* Local command KEY. This command is used to set and unset private
+   keys for channels, set and unset private keys for private messages
+   with remote clients and to send key agreement requests and
+   negotiate the key agreement protocol with remote client.  The
+   key agreement is supported only to negotiate private message keys,
+   it currently cannot be used to negotiate private keys for channels,
+   as it is not convenient for that purpose. */
+
+typedef struct {
+  SILC_SERVER_REC *server;
+  char *data;
+  char *nick;
+  WI_ITEM_REC *item;
+} *KeyGetClients;
+
+/* Callback to be called after client information is resolved from the
+   server. */
+
+static void silc_client_command_key_get_clients(SilcClient client,
+                                               SilcClientConnection conn,
+                                               SilcStatus status,
+                                               SilcDList clients,
+                                               void *context)
 {
-  SILC_CHANNEL_REC *chanrec;
-  
-  if (!IS_SILC_SERVER(server) || !server->connected)
-    cmd_return_error(CMDERR_NOT_CONNECTED);
-
-  if (*data == '\0') {
-    if (!IS_SILC_CHANNEL(item))
-      cmd_return_error(CMDERR_NOT_JOINED);
-    data = item->name;
+  KeyGetClients internal = (KeyGetClients)context;
+
+  if (!clients) {
+    printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "Unknown nick: %s",
+             internal->nick);
+    silc_free(internal->data);
+    silc_free(internal->nick);
+    silc_free(internal);
+    return;
   }
 
-  chanrec = silc_channel_find(server, data);
-  if (chanrec == NULL) 
-    cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+  signal_emit("command key", 3, internal->data, internal->server,
+             internal->item);
 
-  signal_emit("message part", 5, server, chanrec->name,
-             server->nick, server->conn->local_entry->username, "");
-  
-  silc_command_exec(server, "LEAVE", chanrec->name);
-  signal_stop();
-  
-  channel_destroy(CHANNEL(chanrec));
+  silc_free(internal->data);
+  silc_free(internal->nick);
+  silc_free(internal);
 }
 
-/* ME local command. */
-
-static void command_me(const char *data, SILC_SERVER_REC *server,
-                      WI_ITEM_REC *item)
+static void command_key(const char *data, SILC_SERVER_REC *server,
+                       WI_ITEM_REC *item)
 {
-  SILC_CHANNEL_REC *chanrec;
-  char *tmpcmd = "ME", *tmp;
-  uint32 argc = 0;
+  SilcClientConnection conn;
+  SilcClientEntry client_entry = NULL;
+  SilcDList clients;
+  SILC_CHANNEL_REC *chanrec = NULL;
+  SilcChannelEntry channel_entry = NULL;
+  char *nickname = NULL, *tmp;
+  int command = 0, port = 0, type = 0;
+  char *hostname = NULL;
+  KeyInternal internal = NULL;
+  SilcUInt32 argc = 0;
   unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
+  SilcUInt32 *argv_lens, *argv_types;
+  char *bindhost = NULL;
+  SilcChannelPrivateKey ch = NULL;
+  SilcDList ckeys;
+  SilcBool udp = FALSE;
   int i;
-  if (!IS_SILC_SERVER(server) || !server->connected)
+
+  CMD_SILC_SERVER(server);
+
+  if (!server || !IS_SILC_SERVER(server) || !server->connected)
     cmd_return_error(CMDERR_NOT_CONNECTED);
 
-  if (!IS_SILC_CHANNEL(item))
-    cmd_return_error(CMDERR_NOT_JOINED);
+  conn = server->conn;
 
   /* Now parse all arguments */
-  tmp = g_strconcat(tmpcmd, " ", data, NULL);
-  silc_parse_command_line(tmp, &argv, &argv_lens,
-                         &argv_types, &argc, 2);
+  tmp = g_strconcat("KEY", " ", data, NULL);
+  silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 7);
   g_free(tmp);
 
-  if (argc < 2)
+  if (argc < 4)
     cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
-  chanrec = silc_channel_find(server, item->name);
-  if (chanrec == NULL) 
-    cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+  /* Get type */
+  if (!strcasecmp(argv[1], "msg"))
+    type = 1;
+  if (!strcasecmp(argv[1], "channel"))
+    type = 2;
+
+  if (type == 0)
+    cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+  if (type == 1) {
+    if (argv[2][0] == '*') {
+      nickname = strdup("*");
+    } else {
+      /* Parse the typed nickname. */
+      silc_client_nickname_parse(silc_client, conn, argv[2], &nickname);
+      if (!nickname)
+       nickname = strdup(argv[2]);
+
+      /* Find client entry */
+      clients = silc_client_get_clients_local(silc_client, conn, argv[2],
+                                             FALSE);
+      if (!clients) {
+       KeyGetClients inter = silc_calloc(1, sizeof(*inter));
+       inter->server = server;
+       inter->data = strdup(data);
+       inter->nick = strdup(nickname);
+       inter->item = item;
+       silc_client_get_clients(silc_client, conn, nickname, NULL,
+                               silc_client_command_key_get_clients, inter);
+       goto out;
+      }
+
+      client_entry = silc_dlist_get(clients);
+      silc_client_list_free(silc_client, conn, clients);
+    }
+  }
+
+  if (type == 2) {
+    /* Get channel entry */
+    char *name;
+
+    if (argv[2][0] == '*') {
+      if (!conn->current_channel)
+       cmd_return_error(CMDERR_NOT_JOINED);
+      name = conn->current_channel->channel_name;
+    } else {
+      name = argv[2];
+    }
+
+    chanrec = silc_channel_find(server, name);
+    if (chanrec == NULL)
+      cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+    channel_entry = chanrec->entry;
+  }
+
+  /* Set command */
+  if (!strcasecmp(argv[3], "set")) {
+    command = 1;
+
+    if (argc >= 5) {
+      char *cipher = NULL, *hmac = NULL;
+
+      if (argc >= 6)
+       cipher = argv[5];
+      if (argc >= 7)
+       hmac = argv[6];
+
+      if (type == 1 && client_entry) {
+       /* Set private message key */
+       silc_client_del_private_message_key(silc_client, conn, client_entry);
+       silc_client_add_private_message_key(silc_client, conn, client_entry,
+                                           cipher, hmac,
+                                           argv[4], argv_lens[4]);
+      } else if (type == 2) {
+       /* Set private channel key */
+       if (!(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
+         printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                            SILCTXT_CH_PRIVATE_KEY_NOMODE,
+                            channel_entry->channel_name);
+         goto out;
+       }
+
+       if (!silc_client_add_channel_private_key(silc_client, conn,
+                                                channel_entry, NULL,
+                                                cipher, hmac,
+                                                argv[4],
+                                                argv_lens[4], NULL)) {
+         printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                            SILCTXT_CH_PRIVATE_KEY_ERROR,
+                            channel_entry->channel_name);
+         goto out;
+       }
+
+       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                          SILCTXT_CH_PRIVATE_KEY_ADD,
+                          channel_entry->channel_name);
+      }
+    }
+
+    goto out;
+  }
+
+  /* Unset command */
+  if (!strcasecmp(argv[3], "unset")) {
+    command = 2;
+
+    if (type == 1 && client_entry) {
+      /* Unset private message key */
+      silc_client_del_private_message_key(silc_client, conn, client_entry);
+    } else if (type == 2) {
+      /* Unset channel key(s) */
+      int number;
+
+      if (argc == 4)
+       silc_client_del_channel_private_keys(silc_client, conn,
+                                            channel_entry);
+
+      if (argc > 4) {
+       number = atoi(argv[4]);
+       ckeys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                     channel_entry);
+       if (!ckeys)
+         goto out;
+
+       silc_dlist_start(ckeys);
+       if (!number || number > silc_dlist_count(ckeys)) {
+         silc_dlist_uninit(ckeys);
+         goto out;
+       }
+
+       for (i = 0; i < number; i++)
+         ch = silc_dlist_get(ckeys);
+       if (!ch)
+         goto out;
+
+       silc_client_del_channel_private_key(silc_client, conn, channel_entry,
+                                           ch);
+       silc_dlist_uninit(ckeys);
+      }
+
+      goto out;
+    }
+  }
+
+  /* List command */
+  if (!strcasecmp(argv[3], "list")) {
+    command = 3;
+
+    if (type == 1) {
+      SilcPrivateMessageKeys keys;
+      SilcUInt32 keys_count;
+      int k, i, len;
+      char buf[1024];
+
+      keys = silc_client_list_private_message_keys(silc_client, conn,
+                                                  &keys_count);
+      if (!keys)
+       goto out;
+
+      /* list the private message key(s) */
+      if (nickname[0] == '*') {
+       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                          SILCTXT_PRIVATE_KEY_LIST);
+       for (k = 0; k < keys_count; k++) {
+         memset(buf, 0, sizeof(buf));
+         strncat(buf, "  ", 2);
+         len = strlen(keys[k].client_entry->nickname);
+         strncat(buf, keys[k].client_entry->nickname, len > 30 ? 30 : len);
+         if (len < 30)
+           for (i = 0; i < 30 - len; i++)
+             strcat(buf, " ");
+         strcat(buf, " ");
+
+         len = strlen(keys[k].cipher);
+         strncat(buf, keys[k].cipher, len > 14 ? 14 : len);
+         if (len < 14)
+           for (i = 0; i < 14 - len; i++)
+             strcat(buf, " ");
+         strcat(buf, " ");
+
+         if (keys[k].key)
+           strcat(buf, "<hidden>");
+         else
+           strcat(buf, "*generated*");
+
+         silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
+       }
+      } else {
+       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                          SILCTXT_PRIVATE_KEY_LIST_NICK,
+                          client_entry->nickname);
+       for (k = 0; k < keys_count; k++) {
+         if (keys[k].client_entry != client_entry)
+           continue;
+
+         memset(buf, 0, sizeof(buf));
+         strncat(buf, "  ", 2);
+         len = strlen(keys[k].client_entry->nickname);
+         strncat(buf, keys[k].client_entry->nickname, len > 30 ? 30 : len);
+         if (len < 30)
+           for (i = 0; i < 30 - len; i++)
+             strcat(buf, " ");
+         strcat(buf, " ");
+
+         len = strlen(keys[k].cipher);
+         strncat(buf, keys[k].cipher, len > 14 ? 14 : len);
+         if (len < 14)
+           for (i = 0; i < 14 - len; i++)
+             strcat(buf, " ");
+         strcat(buf, " ");
+
+         if (keys[k].key)
+           strcat(buf, "<hidden>");
+         else
+           strcat(buf, "*generated*");
+
+         silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
+       }
+      }
+
+      silc_client_free_private_message_keys(keys, keys_count);
+
+    } else if (type == 2) {
+      int len;
+      char buf[1024];
+
+      ckeys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                   channel_entry);
+
+      printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                        SILCTXT_CH_PRIVATE_KEY_LIST,
+                        channel_entry->channel_name);
+
+      if (!ckeys)
+       goto out;
+
+      silc_dlist_start(ckeys);
+      while ((ch = silc_dlist_get(ckeys))) {
+       memset(buf, 0, sizeof(buf));
+       strncat(buf, "  ", 2);
+
+       len = strlen(silc_cipher_get_name(ch->send_key));
+       strncat(buf, silc_cipher_get_name(ch->send_key),
+               len > 16 ? 16 : len);
+       if (len < 16)
+         for (i = 0; i < 16 - len; i++)
+           strcat(buf, " ");
+       strcat(buf, " ");
+
+       len = strlen(silc_hmac_get_name(ch->hmac));
+       strncat(buf, silc_hmac_get_name(ch->hmac), len > 16 ? 16 : len);
+       if (len < 16)
+         for (i = 0; i < 16 - len; i++)
+           strcat(buf, " ");
+       strcat(buf, " ");
+
+       strcat(buf, "<hidden>");
+
+       silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
+      }
+
+      silc_dlist_uninit(ckeys);
+    }
+
+    goto out;
+  }
+
+  /* Send command is used to send key agreement */
+  if (!strcasecmp(argv[3], "agreement")) {
+    command = 4;
+
+    if (argc >= 5)
+      hostname = argv[4];
+    if (argc >= 6) {
+      if (!strcasecmp(argv[5], "UDP"))
+       udp = TRUE;
+      else
+       port = atoi(argv[5]);
+    }
+    if (argc >= 7)
+      udp = TRUE;
+
+    internal = silc_calloc(1, sizeof(*internal));
+    internal->type = type;
+    internal->server = server;
+
+    if (!hostname) {
+      if (settings_get_bool("use_auto_addr")) {
+        hostname = (char *)settings_get_str("auto_public_ip");
+
+       /* If the hostname isn't set, treat this case as if auto_public_ip
+          wasn't set. */
+        if ((hostname) && (*hostname == '\0')) {
+           hostname = NULL;
+        } else {
+          bindhost = (char *)settings_get_str("auto_bind_ip");
+
+         /* if the bind_ip isn't set, but the public_ip IS, then assume then
+            public_ip is the same value as the bind_ip. */
+          if ((bindhost) && (*bindhost == '\0'))
+            bindhost = hostname;
+         port = settings_get_int("auto_bind_port");
+        }
+      }  /* if use_auto_addr */
+    }
+  }
+
+  /* Start command is used to start key agreement (after receiving the
+     key_agreement client operation). */
+  if (!strcasecmp(argv[3], "negotiate")) {
+    command = 5;
+
+    if (argc >= 5)
+      hostname = argv[4];
+    if (argc >= 6) {
+      if (!strcasecmp(argv[5], "UDP"))
+       udp = TRUE;
+      else
+       port = atoi(argv[5]);
+    }
+    if (argc >= 7)
+      udp = TRUE;
+
+    internal = silc_calloc(1, sizeof(*internal));
+    internal->type = type;
+    internal->server = server;
+  }
 
-  /* Send the action message */
-  silc_client_send_channel_message(silc_client, server->conn, 
-                                  chanrec->entry, NULL,
-                                  SILC_MESSAGE_FLAG_ACTION, 
-                                  argv[1], argv_lens[1], TRUE);
+  /* Change current channel private key */
+  if (!strcasecmp(argv[3], "change")) {
+    command = 6;
+    if (type == 2) {
+      /* Unset channel key(s) */
+      int number;
+
+      ckeys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                   channel_entry);
+      if (!ckeys)
+       goto out;
+
+      silc_dlist_start(ckeys);
+      if (argc == 4) {
+       chanrec->cur_key++;
+       if (chanrec->cur_key >= silc_dlist_count(ckeys))
+         chanrec->cur_key = 0;
+      }
+
+      if (argc > 4) {
+       number = atoi(argv[4]);
+       if (!number || number > silc_dlist_count(ckeys))
+         chanrec->cur_key = 0;
+       else
+         chanrec->cur_key = number - 1;
+      }
+
+      for (i = 0; i < chanrec->cur_key; i++)
+       ch = silc_dlist_get(ckeys);
+      if (!ch)
+       goto out;
+
+      /* Set the current channel private key */
+      silc_client_current_channel_private_key(silc_client, conn,
+                                             channel_entry, ch);
+      printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                        SILCTXT_CH_PRIVATE_KEY_CHANGE, i + 1,
+                        channel_entry->channel_name);
+
+      silc_dlist_uninit(ckeys);
+      goto out;
+    }
+  }
 
-  for (i = 0; i < argc; i++)
-    silc_free(argv[i]);
-  silc_free(argv_lens);
-  silc_free(argv_types);
+  if (command == 0) {
+    silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
+            "Usage: /KEY msg|channel <nickname|channel> "
+            "set|unset|agreement|negotiate [<arguments>]");
+    goto out;
+  }
+
+  if (command == 4 && client_entry) {
+    SilcClientConnectionParams params;
+
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT, argv[2]);
+    internal->responder = TRUE;
+
+    memset(&params, 0, sizeof(params));
+    params.local_ip = hostname;
+    params.bind_ip = bindhost;
+    params.local_port = port;
+    params.udp = udp;
+    params.timeout_secs = settings_get_int("key_exchange_timeout_secs");
+
+    silc_client_send_key_agreement(
+                          silc_client, conn, client_entry, &params,
+                          irssi_pubkey, irssi_privkey,
+                          keyagr_completion, internal);
+    if (!hostname)
+      silc_free(internal);
+    goto out;
+  }
+
+  if (command == 5 && client_entry && hostname) {
+    SilcClientConnectionParams params;
+
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_NEGOTIATE, argv[2]);
+    internal->responder = FALSE;
+
+    memset(&params, 0, sizeof(params));
+    if (udp) {
+      if (settings_get_bool("use_auto_addr")) {
+       params.local_ip = (char *)settings_get_str("auto_public_ip");
+       if ((params.local_ip) && (*params.local_ip == '\0')) {
+         params.local_ip = silc_net_localip();
+       } else {
+         params.bind_ip = (char *)settings_get_str("auto_bind_ip");
+         if ((params.bind_ip) && (*params.bind_ip == '\0'))
+           params.bind_ip = NULL;
+         params.local_port = settings_get_int("auto_bind_port");
+       }
+      }
+      if (!params.local_ip)
+       params.local_ip = silc_net_localip();
+    }
+    params.udp = udp;
+    params.timeout_secs = settings_get_int("key_exchange_timeout_secs");
+
+    silc_client_perform_key_agreement(silc_client, conn, client_entry, &params,
+                                     irssi_pubkey, irssi_privkey,
+                                     hostname, port, keyagr_completion,
+                                     internal);
+    goto out;
+  }
+
+ out:
+  silc_free(nickname);
+  return;
 }
 
-/* NOTICE local command. */
+void silc_list_key(const char *pub_filename, int verbose)
+{
+  SilcPublicKey public_key;
+  SilcPublicKeyIdentifier ident;
+  SilcSILCPublicKey silc_pubkey;
+  char *fingerprint, *babbleprint;
+  unsigned char *pk;
+  SilcUInt32 pk_len;
+  SilcUInt32 key_len = 0;
+  int is_server_key = (strstr(pub_filename, "serverkeys") != NULL);
+
+  if (!silc_pkcs_load_public_key((char *)pub_filename, SILC_PKCS_ANY,
+                                &public_key)) {
+    printformat_module("fe-common/silc", NULL, NULL,
+                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
+                      pub_filename);
+    return;
+  }
 
-static void command_notice(const char *data, SILC_SERVER_REC *server,
-                          WI_ITEM_REC *item)
+  /* Print only SILC public keys */
+  if (silc_pkcs_get_type(public_key) != SILC_PKCS_SILC) {
+    printformat_module("fe-common/silc", NULL, NULL,
+                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
+                      pub_filename);
+    return;
+  }
+
+  silc_pubkey = silc_pkcs_public_key_get_pkcs(SILC_PKCS_SILC, public_key);
+  ident = &silc_pubkey->identifier;
+
+  pk = silc_pkcs_public_key_encode(NULL, public_key, &pk_len);
+  if (!pk)
+    return;
+  fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
+  babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
+  key_len = silc_pkcs_public_key_get_len(public_key);
+
+  printformat_module("fe-common/silc", NULL, NULL,
+                     MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_FILE,
+                     pub_filename);
+
+  if (verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_ALG,
+                      silc_pkcs_get_name(public_key));
+  if (key_len && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                        MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_BITS,
+                        (unsigned int)key_len);
+  if (ident->version && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                        MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_VER,
+                        ident->version);
+  if (ident->realname && (!is_server_key || verbose))
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_RN,
+                       ident->realname);
+  if (ident->username && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_UN,
+                       ident->username);
+  if (ident->host && (is_server_key || verbose))
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_HN,
+                       ident->host);
+  if (ident->email && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_EMAIL,
+                       ident->email);
+  if (ident->org && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_ORG,
+                       ident->org);
+  if (ident->country && verbose)
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_C,
+                       ident->country);
+
+  if (verbose) {
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_FINGER,
+                       fingerprint);
+    printformat_module("fe-common/silc", NULL, NULL,
+                       MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_BABL,
+                       babbleprint);
+  }
+
+  silc_free(fingerprint);
+  silc_free(babbleprint);
+  silc_free(pk);
+  silc_pkcs_public_key_free(public_key);
+}
+
+void silc_list_keys_in_dir(const char *dirname, const char *where)
 {
-  SILC_CHANNEL_REC *chanrec;
-  char *tmpcmd = "ME", *tmp;
-  uint32 argc = 0;
-  unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
-  int i;
-  if (!IS_SILC_SERVER(server) || !server->connected)
-    cmd_return_error(CMDERR_NOT_CONNECTED);
+  DIR *dir;
+  struct dirent *entry;
 
-  if (!IS_SILC_CHANNEL(item))
-    cmd_return_error(CMDERR_NOT_JOINED);
+  dir = opendir(dirname);
 
-  /* Now parse all arguments */
-  tmp = g_strconcat(tmpcmd, " ", data, NULL);
-  silc_parse_command_line(tmp, &argv, &argv_lens,
-                         &argv_types, &argc, 2);
-  g_free(tmp);
+  if (dir == NULL)
+    cmd_return_error(CMDERR_ERRNO);
 
-  if (argc < 2)
-    cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+  printformat_module("fe-common/silc", NULL, NULL,
+                     MSGLEVEL_CRAP, SILCTXT_LISTKEY_LIST,
+                     where);
 
-  chanrec = silc_channel_find(server, item->name);
-  if (chanrec == NULL) 
-    cmd_return_error(CMDERR_CHAN_NOT_FOUND);
+  rewinddir(dir);
 
-  /* Send the action message */
-  silc_client_send_channel_message(silc_client, server->conn, 
-                                  chanrec->entry, NULL,
-                                  SILC_MESSAGE_FLAG_NOTICE, 
-                                  argv[1], argv_lens[1], TRUE);
+  while ((entry = readdir(dir)) != NULL) {
+    /* try to open everything that isn't a directory */
+    struct stat buf;
+    char filename[256];
 
-  for (i = 0; i < argc; i++)
-    silc_free(argv[i]);
-  silc_free(argv_lens);
-  silc_free(argv_types);
+    snprintf(filename, sizeof(filename) - 1, "%s/%s", dirname, entry->d_name);
+    if (!stat(filename, &buf) && S_ISREG(buf.st_mode))
+      silc_list_key(filename, FALSE);
+  }
+
+  closedir(dir);
+}
+
+void silc_list_file(const char *filename)
+{
+
+  char path[256];
+  struct stat buf;
+
+  snprintf(path, sizeof(path) - 1, "%s", filename);
+  if (!stat(path, &buf) && S_ISREG(buf.st_mode))
+    goto list_key;
+
+  snprintf(path, sizeof(path) - 1, "%s/%s", get_irssi_dir(), filename);
+  if (!stat(path, &buf) && S_ISREG(buf.st_mode))
+    goto list_key;
+
+  snprintf(path,sizeof(path) - 1, "%s/clientkeys/%s", get_irssi_dir(),
+          filename);
+  if (!stat(path, &buf) && S_ISREG(buf.st_mode))
+    goto list_key;
+
+  snprintf(path,sizeof(path) - 1, "%s/serverkeys/%s", get_irssi_dir(),
+          filename);
+  if (!stat(path, &buf) && S_ISREG(buf.st_mode))
+    goto list_key;
+
+  return;
+
+list_key:
+
+  silc_list_key(path, TRUE);
+}
+
+/* Lists locally saved client and server public keys. */
+static void command_listkeys(const char *data, SILC_SERVER_REC *server,
+                            WI_ITEM_REC *item)
+{
+  GHashTable *optlist;
+  char *filename;
+  void *free_arg;
+  char dirname[256];
+
+  if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
+                     PARAM_FLAG_GETREST, "listkeys", &optlist,
+                     &filename))
+    return;
+
+  if (*filename != '\0') {
+
+    silc_list_file(filename);
+
+  } else {
+    int clients, servers;
+
+    clients = (g_hash_table_lookup(optlist, "clients") != NULL);
+    servers = (g_hash_table_lookup(optlist, "servers") != NULL);
+
+    if (!(clients || servers))
+      clients = servers = 1;
+
+    if (servers) {
+      snprintf(dirname, sizeof(dirname) - 1, "%s/serverkeys", get_irssi_dir());
+      silc_list_keys_in_dir(dirname, "server");
+    }
+
+    if (clients) {
+      snprintf(dirname, sizeof(dirname) - 1, "%s/clientkeys", get_irssi_dir());
+      silc_list_keys_in_dir(dirname, "client");
+    }
+  }
+  cmd_params_free(free_arg);
 }
 
 void silc_channels_init(void)
@@ -519,26 +1261,20 @@ void silc_channels_init(void)
   signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
   signal_add("server connected", (SIGNAL_FUNC) sig_connected);
   signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
+  signal_add("mime", (SIGNAL_FUNC) sig_mime);
+
+  command_bind_silc("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
+  command_bind_silc("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
+  command_bind_silc("action", MODULE_NAME, (SIGNAL_FUNC) command_action);
+  command_bind_silc("notice", MODULE_NAME, (SIGNAL_FUNC) command_notice);
+  command_bind_silc("away", MODULE_NAME, (SIGNAL_FUNC) command_away);
+  command_bind_silc("key", MODULE_NAME, (SIGNAL_FUNC) command_key);
+  command_bind("listkeys", MODULE_NAME, (SIGNAL_FUNC) command_listkeys);
+
+  command_set_options("listkeys", "clients servers");
+  command_set_options("action", "sign channel");
+  command_set_options("notice", "sign channel");
 
-  signal_add("silc event join", (SIGNAL_FUNC) event_join);
-  signal_add("silc event leave", (SIGNAL_FUNC) event_leave);
-  signal_add("silc event signoff", (SIGNAL_FUNC) event_signoff);
-  signal_add("silc event topic", (SIGNAL_FUNC) event_topic);
-  signal_add("silc event invite", (SIGNAL_FUNC) event_invite);
-  signal_add("silc event nick", (SIGNAL_FUNC) event_nick);
-  signal_add("silc event cmode", (SIGNAL_FUNC) event_cmode);
-  signal_add("silc event cumode", (SIGNAL_FUNC) event_cumode);
-  signal_add("silc event motd", (SIGNAL_FUNC) event_motd);
-  signal_add("silc event channel_change", (SIGNAL_FUNC) event_channel_change);
-  signal_add("silc event server_signoff", (SIGNAL_FUNC) event_server_signoff);
-  signal_add("silc event kick", (SIGNAL_FUNC) event_kick);
-  signal_add("silc event kill", (SIGNAL_FUNC) event_kill);
-  signal_add("silc event ban", (SIGNAL_FUNC) event_ban);
-  
-  command_bind("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
-  command_bind("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
-  command_bind("notice", MODULE_NAME, (SIGNAL_FUNC) command_notice);
-  
   silc_nicklist_init();
 }
 
@@ -547,27 +1283,15 @@ void silc_channels_deinit(void)
   signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
   signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
   signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
+  signal_remove("mime", (SIGNAL_FUNC) sig_mime);
 
-  signal_remove("silc event join", (SIGNAL_FUNC) event_join);
-  signal_remove("silc event leave", (SIGNAL_FUNC) event_leave);
-  signal_remove("silc event signoff", (SIGNAL_FUNC) event_signoff);
-  signal_remove("silc event topic", (SIGNAL_FUNC) event_topic);
-  signal_remove("silc event invite", (SIGNAL_FUNC) event_invite);
-  signal_remove("silc event nick", (SIGNAL_FUNC) event_nick);
-  signal_remove("silc event cmode", (SIGNAL_FUNC) event_cmode);
-  signal_remove("silc event cumode", (SIGNAL_FUNC) event_cumode);
-  signal_remove("silc event motd", (SIGNAL_FUNC) event_motd);
-  signal_remove("silc event channel_change", 
-               (SIGNAL_FUNC) event_channel_change);
-  signal_remove("silc event server_signoff", 
-               (SIGNAL_FUNC) event_server_signoff);
-  signal_remove("silc event kick", (SIGNAL_FUNC) event_kick);
-  signal_remove("silc event kill", (SIGNAL_FUNC) event_kill);
-  signal_remove("silc event ban", (SIGNAL_FUNC) event_ban);
-  
   command_unbind("part", (SIGNAL_FUNC) command_part);
   command_unbind("me", (SIGNAL_FUNC) command_me);
+  command_unbind("action", (SIGNAL_FUNC) command_action);
   command_unbind("notice", (SIGNAL_FUNC) command_notice);
-  
+  command_unbind("away", (SIGNAL_FUNC) command_away);
+  command_unbind("key", (SIGNAL_FUNC) command_key);
+  command_unbind("listkeys", (SIGNAL_FUNC) command_listkeys);
+
   silc_nicklist_deinit();
 }