implemented KICK command

[silc.git] / lib / silcclient / command_reply.c

diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index 783c74a9f4a74cd476dd0d861b99e6fffae2c55a..c026a869182080503136569630e17f8d350278b1 100644 (file)
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -107,6 +107,7 @@ const SilcCommandStatusMessage silc_command_status_messages[] = {
   { STAT(UNKNOWN_MODE),    "Unknown mode" },
   { STAT(NOT_YOU),         "Cannot change mode for other users" },
   { STAT(NO_CHANNEL_PRIV), "Permission denied. You are not channel operator" },
+  { STAT(NO_CHANNEL_FOPRIV),"Permission denied. You are not channel founder" },
   { STAT(NO_SERVER_PRIV),  "Permission denied. You are not server operator" },
   { STAT(NO_ROUTER_PRIV),  "Permission denied. You are not SILC operator" },
   { STAT(BAD_NICKNAME),    "Bad nickname" },
@@ -229,6 +230,10 @@ silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd,
   }
   
   client_id = silc_id_payload_parse_id(id_data, len);
+  if (!client_id) {
+    COMMAND_REPLY_ERROR;
+    return;
+  }
   
   nickname = silc_argument_get_arg_type(cmd->args, 3, &len);
   if (nickname) {
@@ -280,6 +285,7 @@ silc_client_command_reply_whois_print(SilcClientCommandReplyContext cmd,
       client_entry->realname = strdup(realname);
 
     id_cache->data = client_entry->nickname;
+    silc_idcache_sort_by_data(conn->client_cache);
 
     silc_free(client_id);
   }
@@ -348,9 +354,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(whois)
   }
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_WHOIS);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_WHOIS);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_WHOIS);
   silc_client_command_reply_free(cmd);
 }
 
@@ -410,6 +417,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify)
     if (!id_data)
       goto out;
     client_id = silc_id_payload_parse_id(id_data, len);
+    if (!client_id)
+      goto out;
 
     nickname = silc_argument_get_arg_type(cmd->args, 3, NULL);
     username = silc_argument_get_arg_type(cmd->args, 4, NULL);
@@ -442,7 +451,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify)
        client_entry->username = strdup(username);
 
       id_cache->data = client_entry->nickname;
-
+      silc_idcache_sort_by_data(conn->client_cache);
+    
       silc_free(client_id);
     }
   }
@@ -456,9 +466,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(identify)
   }
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_IDENTIFY);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_IDENTIFY);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_IDENTIFY);
   silc_client_command_reply_free(cmd);
 }
 
@@ -495,15 +506,20 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick)
   /* Take received Client ID */
   tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
   idp = silc_id_payload_parse_data(tmp, len);
+  if (!idp) {
+    COMMAND_REPLY_ERROR;
+    goto out;
+  }
   silc_client_receive_new_id(cmd->client, cmd->sock, idp);
     
   /* Notify application */
   COMMAND_REPLY((ARGS, conn->local_entry));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_NICK);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_NICK);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_NICK);
   silc_client_command_reply_free(cmd);
 }
 
@@ -530,6 +546,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic)
     cmd->client->ops->say(cmd->client, conn,
             "%s", silc_client_command_status_message(status));
     COMMAND_REPLY_ERROR;
+    SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC);
     silc_client_command_reply_free(cmd);
     return;
   }
@@ -551,6 +568,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic)
     goto out;
 
   channel_id = silc_id_payload_parse_id(tmp, len);
+  if (!channel_id)
+    goto out;
 
   /* Get the channel name */
   if (!silc_idcache_find_by_id_one(conn->channel_cache, (void *)channel_id,
@@ -570,9 +589,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(topic)
   COMMAND_REPLY((ARGS, channel, topic));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_TOPIC);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_TOPIC);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_TOPIC);
   silc_client_command_reply_free(cmd);
 }
 
@@ -591,6 +611,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite)
     cmd->client->ops->say(cmd->client, conn,
             "%s", silc_client_command_status_message(status));
     COMMAND_REPLY_ERROR;
+    SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE);
     silc_client_command_reply_free(cmd);
     return;
   }
@@ -599,8 +620,9 @@ SILC_CLIENT_CMD_REPLY_FUNC(invite)
   COMMAND_REPLY((ARGS));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_INVITE);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INVITE);
 
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INVITE);
   silc_client_command_reply_free(cmd);
 }
  
@@ -629,6 +651,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(info)
     cmd->client->ops->say(cmd->client, conn,
             "%s", silc_client_command_status_message(status));
     COMMAND_REPLY_ERROR;
+    SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
     silc_client_command_reply_free(cmd);
     return;
   }
@@ -651,9 +674,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(info)
   COMMAND_REPLY((ARGS, NULL, (char *)tmp));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_INFO);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_INFO);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_INFO);
   silc_client_command_reply_free(cmd);
 }
 
@@ -681,7 +705,12 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping)
   }
 
   curtime = time(NULL);
-  id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_type);
+  id = silc_id_str2id(cmd->packet->src_id, cmd->packet->src_id_len,
+                     cmd->packet->src_id_type);
+  if (!id) {
+    COMMAND_REPLY_ERROR;
+    goto out;
+  }
 
   for (i = 0; i < conn->ping_count; i++) {
     if (!SILC_ID_SERVER_COMPARE(conn->ping[i].dest_id, id)) {
@@ -690,25 +719,26 @@ SILC_CLIENT_CMD_REPLY_FUNC(ping)
                            "Ping reply from %s: %d second%s", 
                            conn->ping[i].dest_name, diff, 
                            diff == 1 ? "" : "s");
-
+      
       conn->ping[i].start_time = 0;
       silc_free(conn->ping[i].dest_id);
       conn->ping[i].dest_id = NULL;
       silc_free(conn->ping[i].dest_name);
       conn->ping[i].dest_name = NULL;
-
-      /* Notify application */
-      COMMAND_REPLY((ARGS));
       break;
     }
   }
 
   silc_free(id);
 
+  /* Notify application */
+  COMMAND_REPLY((ARGS));
+
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_PING);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_PING);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_PING);
   silc_client_command_reply_free(cmd);
 }
 
@@ -767,6 +797,11 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
     goto out;
   }
   idp = silc_id_payload_parse_data(tmp, len);
+  if (!idp) {
+    COMMAND_REPLY_ERROR;
+    silc_free(channel_name);
+    goto out;
+  }
 
   /* Get channel mode */
   tmp = silc_argument_get_arg_type(cmd->args, 4, NULL);
@@ -807,9 +842,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
                 NULL, NULL, topic));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_JOIN);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_JOIN);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_JOIN);
   silc_client_command_reply_free(cmd);
 }
 
@@ -870,9 +906,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(motd)
   COMMAND_REPLY((ARGS, motd));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_MOTD);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_MOTD);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_MOTD);
   silc_client_command_reply_free(cmd);
 }
 
@@ -908,9 +945,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode)
   COMMAND_REPLY((ARGS, tmp));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_CMODE);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CMODE);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CMODE);
   silc_client_command_reply_free(cmd);
 }
 
@@ -948,6 +986,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode)
     goto out;
   }
   client_id = silc_id_payload_parse_id(id, len);
+  if (!client_id) {
+    COMMAND_REPLY_ERROR;
+    goto out;
+  }
   
   /* Get client entry */
   if (!silc_idcache_find_by_id_one(conn->client_cache, (void *)client_id,
@@ -961,14 +1003,38 @@ SILC_CLIENT_CMD_REPLY_FUNC(cumode)
   silc_free(client_id);
   
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_CUMODE);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_CUMODE);
 
  out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_CUMODE);
   silc_client_command_reply_free(cmd);
 }
 
 SILC_CLIENT_CMD_REPLY_FUNC(kick)
 {
+  SilcClientCommandReplyContext cmd = (SilcClientCommandReplyContext)context;
+  SilcClientConnection conn = (SilcClientConnection)cmd->sock->user_data;
+  SilcCommandStatus status;
+  unsigned char *tmp;
+
+  tmp = silc_argument_get_arg_type(cmd->args, 1, NULL);
+  SILC_GET16_MSB(status, tmp);
+  if (status != SILC_STATUS_OK) {
+    cmd->client->ops->say(cmd->client, conn,
+            "%s", silc_client_command_status_message(status));
+    COMMAND_REPLY_ERROR;
+    goto out;
+  }
+
+  /* Notify application */
+  COMMAND_REPLY((ARGS));
+
+  /* Execute any pending command callbacks */
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_KICK);
+
+ out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_KICK);
+  silc_client_command_reply_free(cmd);
 }
 
 SILC_CLIENT_CMD_REPLY_FUNC(restart)
@@ -1002,15 +1068,17 @@ SILC_CLIENT_CMD_REPLY_FUNC(leave)
     cmd->client->ops->say(cmd->client, conn,
             "%s", silc_client_command_status_message(status));
     COMMAND_REPLY_ERROR;
-    return;
+    goto out;
   }
 
   /* Notify application */
   COMMAND_REPLY((ARGS));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_LEAVE);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_LEAVE);
 
+ out:
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_LEAVE);
   silc_client_command_reply_free(cmd);
 }
 
@@ -1050,6 +1118,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
   if (!tmp)
     goto out;
   channel_id = silc_id_payload_parse_id(tmp, tmp_len);
+  if (!channel_id)
+    goto out;
 
   /* Get the list count */
   tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
@@ -1103,6 +1173,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
     SILC_GET16_MSB(idp_len, client_id_list->data + 2);
     idp_len += 4;
     client_id = silc_id_payload_parse_id(client_id_list->data, idp_len);
+    if (!client_id)
+      continue;
 
     /* Mode */
     SILC_GET32_MSB(mode, client_mode_list->data);
@@ -1155,7 +1227,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
        command reply we will reprocess this command reply by re-calling this
        USERS command reply callback. */
     silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
-                               silc_client_command_reply_users, cmd);
+                               NULL, silc_client_command_reply_users, cmd);
 
     silc_buffer_free(res_cmd);
     if (channel_id)
@@ -1212,7 +1284,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
                 client_mode_list->head));
 
   /* Execute any pending command callbacks */
-  SILC_CLIENT_COMMAND_EXEC_PENDING(cmd, SILC_COMMAND_USERS);
+  SILC_CLIENT_PENDING_EXEC(cmd, SILC_COMMAND_USERS);
 
   silc_buffer_free(client_id_list);
   silc_buffer_free(client_mode_list);
@@ -1220,5 +1292,6 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
  out:
   if (channel_id)
     silc_free(channel_id);
+  SILC_CLIENT_PENDING_DESTRUCTOR(cmd, SILC_COMMAND_USERS);
   silc_client_command_reply_free(cmd);
 }