udpates.

[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 81696eeecbd0b160cd02b0358c29d669c0208e89..3bdc9cc780ce1debcab8175469cd8629f7e35fd0 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;
     
@@ -829,7 +833,7 @@ SILC_CLIENT_CMD_FUNC(key_get_clients)
 static void command_key(const char *data, SILC_SERVER_REC *server,
                        WI_ITEM_REC *item)
 {
-  SilcClientConnection conn = server->conn;
+  SilcClientConnection conn;
   SilcClientEntry client_entry = NULL;
   SilcChannelEntry channel_entry = NULL;
   char *nickname = NULL, *tmp;
@@ -840,20 +844,18 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   unsigned char **argv;
   uint32 *argv_lens, *argv_types;
  
-  if (!IS_SILC_SERVER(server) || !server->connected)
+  if (!server || !IS_SILC_SERVER(server) || !server->connected)
     cmd_return_error(CMDERR_NOT_CONNECTED);
 
+  conn = server->conn;
+
   /* Now parse all arguments */
   tmp = g_strconcat("KEY", " ", data, NULL);
   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"))
@@ -861,16 +863,12 @@ 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] == '*') {
-      nickname = "*";
+      nickname = strdup("*");
     } else {
       /* Parse the typed nickname. */
       if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
@@ -1099,6 +1097,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
       }
 
       silc_client_free_private_message_keys(keys, keys_count);
+
     } else if (type == 2) {
       SilcChannelPrivateKey *keys;
       uint32 keys_count;
@@ -1108,12 +1107,14 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
       keys = silc_client_list_channel_private_keys(silc_client, conn, 
                                                   channel_entry,
                                                   &keys_count);
-      if (!keys)
-       goto out;
-      
+
       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                         SILCTXT_CH_PRIVATE_KEY_LIST,
                         channel_entry->channel_name);
+
+      if (!keys)
+       goto out;
+      
       for (k = 0; k < keys_count; k++) {
        memset(buf, 0, sizeof(buf));
        strncat(buf, "  ", 2);
@@ -1180,7 +1181,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, 
@@ -1191,7 +1192,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,