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 9febc67084e5259fa02a8348d68f6379fc204165..a44f88cd6bdf6da1aad165e059a71b36133b6cb1 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -162,6 +162,7 @@ static void event_join(SILC_SERVER_REC *server, va_list va)
     }
   }
 
+  memset(userhost, 0, sizeof(userhost));
   if (client->username)
     snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
             client->username, client->hostname);
@@ -185,6 +186,7 @@ static void event_leave(SILC_SERVER_REC *server, va_list va)
   client = va_arg(va, SilcClientEntry);
   channel = va_arg(va, SilcChannelEntry);
 
+  memset(userhost, 0, sizeof(userhost));
   if (client->username)
     snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
             client->username, client->hostname);
@@ -214,6 +216,7 @@ static void event_signoff(SILC_SERVER_REC *server, va_list va)
   client = va_arg(va, SilcClientEntry);
   message = va_arg(va, char *);
 
+  memset(userhost, 0, sizeof(userhost));
   if (client->username)
     snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
             client->username, client->hostname);
@@ -253,6 +256,7 @@ static void event_topic(SILC_SERVER_REC *server, va_list va)
     signal_emit("channel topic changed", 1, chanrec);
   }
 
+  memset(userhost, 0, sizeof(userhost));
   snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
           client->username, client->hostname);
   signal_emit("message topic", 5, server, channel->channel_name,
@@ -274,6 +278,7 @@ static void event_invite(SILC_SERVER_REC *server, va_list va)
   channel_name = va_arg(va, char *);
   client = va_arg(va, SilcClientEntry);
 
+  memset(userhost, 0, sizeof(userhost));
   snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
           client->username, client->hostname);
   signal_emit("message invite", 4, server, channel ? channel->channel_name :
@@ -296,6 +301,7 @@ static void event_nick(SILC_SERVER_REC *server, va_list va)
                         oldclient, oldclient->nickname,
                         newclient, newclient->nickname);
 
+  memset(userhost, 0, sizeof(userhost));
   snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
           newclient->username, newclient->hostname);
   signal_emit("message nick", 4, server, newclient->nickname, 
@@ -326,7 +332,7 @@ static void event_cmode(SILC_SERVER_REC *server, va_list va)
 
   mode = silc_client_chmode(modei, 
                            channel->channel_key->cipher->name,
-                           channel->hmac->hmac->name);
+                           silc_hmac_get_name(channel->hmac));
   
   chanrec = silc_channel_find_entry(server, channel);
   if (chanrec != NULL) {
@@ -543,6 +549,7 @@ static void command_part(const char *data, SILC_SERVER_REC *server,
   if (chanrec == NULL) 
     cmd_return_error(CMDERR_CHAN_NOT_FOUND);
 
+  memset(userhost, 0, sizeof(userhost));
   snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
           server->conn->local_entry->username, 
           server->conn->local_entry->hostname);
@@ -822,7 +829,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;
@@ -833,9 +840,11 @@ 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);
@@ -863,7 +872,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
   if (type == 1) {
     if (argv[2][0] == '*') {
-      nickname = "*";
+      nickname = strdup("*");
     } else {
       /* Parse the typed nickname. */
       if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
@@ -1092,6 +1101,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;
@@ -1101,12 +1111,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);
@@ -1118,8 +1130,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
            strcat(buf, " ");
        strcat(buf, " ");
        
-       len = strlen(keys[k]->hmac->hmac->name);
-       strncat(buf, keys[k]->hmac->hmac->name, len > 16 ? 16 : len);
+       len = strlen(silc_hmac_get_name(keys[k]->hmac));
+       strncat(buf, silc_hmac_get_name(keys[k]->hmac), len > 16 ? 16 : len);
        if (len < 16)
          for (i = 0; i < 16 - len; i++)
            strcat(buf, " ");