Added support for removing client from invite list when kicked.

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

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index fbb5a9d0badb8c9c2740340781030b1223050572..7f3a8ba92f9be64938ef46235d01edbbdd4e4fb0 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -1383,41 +1383,53 @@ void silc_server_notify(SilcServer server,
     if (chl->mode & SILC_CHANNEL_UMODE_CHANFO)
       goto out;
     
-    /* From protocol version 1.1 we get the kicker's ID as well. */
+    /* Get the kicker's Client ID */
     tmp = silc_argument_get_arg_type(args, 3, &tmp_len);
-    if (tmp) {
-      client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
-      if (!client_id)
-       goto out;
+    if (!tmp)
+      goto out;
+    client_id = silc_id_payload_parse_id(tmp, tmp_len, NULL);
+    if (!client_id)
+      goto out;
 
-      /* If the the client is not in local list we check global list */
-      client2 = silc_idlist_find_client_by_id(server->global_list, 
+    /* If the the client is not in local list we check global list */
+    client2 = silc_idlist_find_client_by_id(server->global_list, 
+                                           client_id, TRUE, NULL);
+    if (!client2) {
+      client2 = silc_idlist_find_client_by_id(server->local_list, 
                                              client_id, TRUE, NULL);
       if (!client2) {
-       client2 = silc_idlist_find_client_by_id(server->local_list, 
-                                               client_id, TRUE, NULL);
-       if (!client2) {
-         silc_free(client_id);
-         goto out;
-       }
-      }
-      silc_free(client_id);
-
-      /* Kicker must be operator on channel */
-      if (!silc_server_client_on_channel(client2, channel, &chl))
-       goto out;
-      if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP) &&
-         !(chl->mode & SILC_CHANNEL_UMODE_CHANFO)) {
-       SILC_LOG_DEBUG(("Kicking is not allowed"));
+       silc_free(client_id);
        goto out;
       }
     }
+    silc_free(client_id);
+
+    /* Kicker must be operator on channel */
+    if (!silc_server_client_on_channel(client2, channel, &chl))
+      goto out;
+    if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP) &&
+       !(chl->mode & SILC_CHANNEL_UMODE_CHANFO)) {
+      SILC_LOG_DEBUG(("Kicking is not allowed"));
+      goto out;
+    }
 
     /* Send to channel */
     silc_server_packet_send_to_channel(server, sock, channel, packet->type, 
                                       FALSE, packet->buffer->data, 
                                       packet->buffer->len, FALSE);
 
+    /* Remove the client from channel's invite list */
+    if (channel->invite_list && silc_hash_table_count(channel->invite_list)) {
+      SilcBuffer ab;
+      SilcArgumentPayload iargs;
+      tmp = silc_argument_get_arg_type(args, 1, &tmp_len);
+      ab = silc_argument_payload_encode_one(NULL, tmp, tmp_len, 3);
+      iargs = silc_argument_payload_parse(ab->data, ab->len, 1);
+      silc_server_inviteban_process(server, channel->invite_list, 1, iargs);
+      silc_buffer_free(ab);
+      silc_argument_payload_free(iargs);
+    }
+
     /* Remove the client from channel */
     silc_server_remove_from_one_channel(server, sock, channel, client, FALSE);
 
@@ -1468,34 +1480,34 @@ void silc_server_notify(SilcServer server,
       if (comment_len > 128)
        comment_len = 127;
 
-      /* From protocol version 1.1 we get the killer's ID as well. */
+      /* Get the killer's Client ID */
       tmp = silc_argument_get_arg_type(args, 3, &tmp_len);
-      if (tmp) {
-       client_id = silc_id_payload_parse_id(tmp, tmp_len, &id_type);
-       if (!client_id)
-         goto out;
+      if (!tmp)
+       goto out;
+      client_id = silc_id_payload_parse_id(tmp, tmp_len, &id_type);
+      if (!client_id)
+       goto out;
 
-       if (id_type == SILC_ID_CLIENT) {
-         /* If the the client is not in local list we check global list */
-         client2 = silc_idlist_find_client_by_id(server->global_list, 
+      if (id_type == SILC_ID_CLIENT) {
+       /* If the the client is not in local list we check global list */
+       client2 = silc_idlist_find_client_by_id(server->global_list, 
+                                               client_id, TRUE, NULL);
+       if (!client2) {
+         client2 = silc_idlist_find_client_by_id(server->local_list, 
                                                  client_id, TRUE, NULL);
          if (!client2) {
-           client2 = silc_idlist_find_client_by_id(server->local_list, 
-                                                   client_id, TRUE, NULL);
-           if (!client2) {
-             silc_free(client_id);
-             goto out;
-           }
-         }
-         silc_free(client_id);
-
-         /* Killer must be router operator */
-         if (server->server_type != SILC_SERVER &&
-             !(client2->mode & SILC_UMODE_ROUTER_OPERATOR)) {
-           SILC_LOG_DEBUG(("Killing is not allowed"));
+           silc_free(client_id);
            goto out;
          }
        }
+       silc_free(client_id);
+
+       /* Killer must be router operator */
+       if (server->server_type != SILC_SERVER &&
+           !(client2->mode & SILC_UMODE_ROUTER_OPERATOR)) {
+         SILC_LOG_DEBUG(("Killing is not allowed"));
+         goto out;
+       }
       }
 
       /* Send the notify to local clients on the channels except to the