updates.

[silc.git] / apps / silcd / command_reply.c

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index b6858d77ff63f33ba78018a00bbe57b7730f8a08..60e9f9f76c1b9fe0ca41843ec219f63c35172611 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -84,7 +84,7 @@ void silc_server_command_reply_process(SilcServer server,
      command reply routine receiving it. */
   ctx = silc_calloc(1, sizeof(*ctx));
   ctx->server = server;
-  ctx->sock = sock;
+  ctx->sock = silc_socket_dup(sock);
   ctx->payload = payload;
   ctx->args = silc_command_get_args(ctx->payload);
   ident = silc_command_get_ident(ctx->payload);
@@ -100,7 +100,7 @@ void silc_server_command_reply_process(SilcServer server,
       break;
 
   if (cmd == NULL || !cmd->cb) {
-    silc_free(ctx);
+    silc_server_command_reply_free(ctx);
     return;
   }
 
@@ -113,6 +113,8 @@ void silc_server_command_reply_free(SilcServerCommandReplyContext cmd)
 {
   if (cmd) {
     silc_command_free_payload(cmd->payload);
+    if (cmd->sock)
+      silc_socket_free(cmd->sock); /* Decrease the reference counter */
     silc_free(cmd);
   }
 }
@@ -138,8 +140,13 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
   nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
   username = silc_argument_get_arg_type(cmd->args, 4, &len);
   realname = silc_argument_get_arg_type(cmd->args, 5, &len);
-  if (!id_data || !nickname || !username || !realname) 
+  if (!id_data || !nickname || !username || !realname) {
+    SILC_LOG_ERROR(("Incomplete WHOIS info: %s %s %s",
+                   nickname ? nickname : "",
+                   username ? username : "",
+                   realname ? realname : ""));
     return FALSE;
+  }
 
   client_id = silc_id_payload_parse_id(id_data, id_len);
   if (!client_id)
@@ -175,7 +182,8 @@ silc_server_command_reply_whois_save(SilcServerCommandReplyContext cmd)
        global. */
     silc_idlist_add_client(server->global_list, nick,
                           strdup(username), 
-                          strdup(realname), client_id, NULL, NULL);
+                          strdup(realname), client_id, 
+                          cmd->sock->user_data, NULL);
   } else {
     /* We have the client already, update the data */
 
@@ -230,9 +238,10 @@ SILC_SERVER_CMD_REPLY_FUNC(whois)
     goto out;
 
   /* Execute any pending commands */
-  SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
+  SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
 
  out:
+  SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
   silc_server_command_reply_free(cmd);
 }
 
@@ -293,7 +302,7 @@ silc_server_command_reply_identify_save(SilcServerCommandReplyContext cmd)
        global. */
     silc_idlist_add_client(server->global_list, nick,
                           username ? strdup(username) : NULL, NULL,
-                          client_id, NULL, NULL);
+                          client_id, cmd->sock->user_data, NULL);
   } else {
     /* We have the client already, update the data */
 
@@ -349,9 +358,10 @@ SILC_SERVER_CMD_REPLY_FUNC(identify)
     goto out;
 
   /* Execute any pending commands */
-  SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
+  SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
 
  out:
+  SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
   silc_server_command_reply_free(cmd);
 }
 
@@ -366,6 +376,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   SilcCommandStatus status;
   SilcChannelID *id;
   SilcChannelEntry entry;
+  SilcHmac hmac = NULL;
   unsigned int id_len, len;
   unsigned char *id_string;
   char *channel_name, *tmp;
@@ -410,6 +421,13 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   if (!id)
     goto out;
 
+  /* Get hmac */
+  tmp = silc_argument_get_arg_type(cmd->args, 10, NULL);
+  if (tmp) {
+    if (!silc_hmac_alloc(tmp, NULL, &hmac))
+      goto out;
+  }
+
   /* See whether we already have the channel. */
   entry = silc_idlist_find_channel_by_id(server->local_list, id, NULL);
   if (!entry) {
@@ -422,7 +440,7 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     /* Add the channel to our local list. */
     entry = silc_idlist_add_channel(server->local_list, strdup(channel_name), 
                                    SILC_CHANNEL_MODE_NONE, id, 
-                                   server->router, NULL);
+                                   server->router, NULL, hmac);
     if (!entry) {
       silc_free(id);
       goto out;
@@ -450,9 +468,10 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   silc_buffer_free(keyp);
 
   /* Execute any pending commands */
-  SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_JOIN);
+  SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
 
  out:
+  SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
   silc_server_command_reply_free(cmd);
 }
 
@@ -576,9 +595,10 @@ SILC_SERVER_CMD_REPLY_FUNC(users)
   silc_buffer_free(client_mode_list);
 
   /* Execute any pending commands */
-  SILC_SERVER_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+  SILC_SERVER_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
 
  out:
+  SILC_SERVER_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
   if (channel_id)
     silc_free(channel_id);
   silc_server_command_reply_free(cmd);