updates.

[silc.git] / apps / irssi / src / silc / core / silc-channels.c

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index a44f88cd6bdf6da1aad165e059a71b36133b6cb1..499b0cfe0cd157964786328b3f99bb956aefcc25 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -216,6 +216,8 @@ static void event_signoff(SILC_SERVER_REC *server, va_list va)
   client = va_arg(va, SilcClientEntry);
   message = va_arg(va, char *);
 
+  silc_server_free_ftp(server, client);
+
   memset(userhost, 0, sizeof(userhost));
   if (client->username)
     snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
@@ -249,6 +251,8 @@ static void event_topic(SILC_SERVER_REC *server, va_list va)
   topic = va_arg(va, char *);
   channel = va_arg(va, SilcChannelEntry);
 
+  silc_server_free_ftp(server, client);
+
   chanrec = silc_channel_find_entry(server, channel);
   if (chanrec != NULL) {
     g_free_not_null(chanrec->topic);
@@ -761,7 +765,7 @@ static void keyagr_completion(SilcClient client,
 
   switch(status) {
   case SILC_KEY_AGREEMENT_OK:
-    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES,
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT_OK, client_entry->nickname);
 
     if (i->type == 1) {
@@ -769,7 +773,7 @@ static void keyagr_completion(SilcClient client,
       silc_client_del_private_message_key(client, conn, client_entry);
       silc_client_add_private_message_key_ske(client, conn, client_entry,
                                              NULL, key, i->responder);
-      printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES,
+      printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
                         SILCTXT_KEY_AGREEMENT_PRIVMSG, 
                         client_entry->nickname);
       silc_ske_free_key_material(key);
@@ -778,17 +782,17 @@ static void keyagr_completion(SilcClient client,
     break;
     
   case SILC_KEY_AGREEMENT_ERROR:
-    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_NOTICES,
+    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_NOTICES,
+    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_NOTICES,
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT_TIMEOUT, client_entry->nickname);
     break;
     
@@ -811,18 +815,35 @@ static void keyagr_completion(SilcClient client,
 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. */
 
-SILC_CLIENT_CMD_FUNC(key_get_clients)
+static void silc_client_command_key_get_clients(SilcClient client,
+                                               SilcClientConnection conn,
+                                               SilcClientEntry *clients,
+                                               uint32 clients_count,
+                                               void *context)
 {
   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;
+  }
+
   signal_emit("command key", 3, internal->data, internal->server,
              internal->item);
+
   silc_free(internal->data);
+  silc_free(internal->nick);
   silc_free(internal);
 }
 
@@ -830,7 +851,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
                        WI_ITEM_REC *item)
 {
   SilcClientConnection conn;
-  SilcClientEntry client_entry = NULL;
+  SilcClientEntry *entrys, client_entry = NULL;
+  uint32 entry_count;
   SilcChannelEntry channel_entry = NULL;
   char *nickname = NULL, *tmp;
   int command = 0, port = 0, type = 0;
@@ -850,12 +872,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 7);
   g_free(tmp);
 
-  if (argc < 4) {
-    silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
-            "Usage: /KEY msg|channel <nickname|channel> "
-            "set|unset|agreement|negotiate [<arguments>]");
-    return;
-  }
+  if (argc < 4)
+    cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
   /* Get type */
   if (!strcasecmp(argv[1], "msg"))
@@ -863,12 +881,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   if (!strcasecmp(argv[1], "channel"))
     type = 2;
 
-  if (type == 0) {
-    silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO,
-            "Usage: /KEY msg|channel <nickname|channel> "
-            "set|unset|agreement|negotiate [<arguments>]");
-    return;
-  }
+  if (type == 0)
+    cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
 
   if (type == 1) {
     if (argv[2][0] == '*') {
@@ -882,22 +896,20 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
       }
       
       /* Find client entry */
-      client_entry = silc_idlist_get_client(silc_client, conn, nickname, 
-                                           argv[2], TRUE);
-      if (!client_entry) {
+      entrys = silc_client_get_clients_local(silc_client, conn, nickname,
+                                            argv[2], &entry_count);
+      if (!entrys) {
        KeyGetClients inter = silc_calloc(1, sizeof(*inter));
        inter->server = server;
        inter->data = strdup(data);
+       inter->nick = strdup(nickname);
        inter->item = item;
-
-       /* Client entry not found, it was requested thus mark this to be
-          pending command. */
-       silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, 
-                                   conn->cmd_ident, 
-                                   NULL, silc_client_command_key_get_clients, 
-                                   inter);
+       silc_client_get_clients(silc_client, conn, nickname, argv[2],
+                               silc_client_command_key_get_clients, inter);
        goto out;
       }
+      client_entry = entrys[0];
+      silc_free(entrys);
     }
   }
 
@@ -1185,7 +1197,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   }
 
   if (command == 4 && client_entry) {
-    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_NOTICES,
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT, argv[2]);
     internal->responder = TRUE;
     silc_client_send_key_agreement(silc_client, conn, client_entry, hostname, 
@@ -1196,7 +1208,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   }
 
   if (command == 5 && client_entry && hostname) {
-    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_NOTICES,
+    printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT_NEGOTIATE, argv[2]);
     internal->responder = FALSE;
     silc_client_perform_key_agreement(silc_client, conn, client_entry,