- Implemented channel modes k (key) and l (user limit).

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 5e4130bedbe4a99b230b64afdc5f0ce3cc2e5588..926d345e9dbf5267302e6a59a0699afb33e01f21 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -2,21 +2,20 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-channel.c,v 1.17 2002/11/30 17:39:56 alex Exp $
- *
- * irc-channel.c: IRC-Channel-Befehle
+ * IRC channel commands
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.21 2002/12/16 23:06:46 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
@@ -32,6 +31,8 @@
 #include "parse.h"
 #include "irc-info.h"
 #include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
 
 #include "exp.h"
 #include "irc-channel.h"
@@ -40,7 +41,7 @@
 GLOBAL BOOLEAN
 IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
-       CHAR *channame, *flags, *topic, modes[8];
+       CHAR *channame, *key, *flags, *topic, modes[8];
        BOOLEAN is_new_chan, is_invited, is_banned;
        CLIENT *target;
        CHANNEL *chan;
@@ -48,14 +49,18 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
-       if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       /* Bad number of arguments? */
+       if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       /* Wer ist der Absender? */
+       /* Who is the sender? */
        if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
        else target = Client;
        if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
+       /* Are channel keys given? */
+       if( Req->argc > 1 ) key = Req->argv[1];
+       else key = NULL;
+
        /* Channel-Namen durchgehen */
        chan = NULL;
        channame = strtok( Req->argv[0], "," );
@@ -82,6 +87,16 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                /* Lokaler Client? */
                if( Client_Type( Client ) == CLIENT_USER )
                {
+                       /* Test if the user has reached his maximum channel count */
+                       if( Client_Type( Client ) == CLIENT_USER )
+                       {
+                               if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
+                               {
+                                       IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
+                                       return CONNECTED;
+                               }
+                       }
+
                        /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
                        if( is_new_chan )
                        {
@@ -103,18 +118,40 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                                        /* Client ist gebanned (und nicht invited): */
                                        IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
 
-                                       /* naechsten Namen ermitteln */
+                                       /* Try next name, if any */
                                        channame = strtok( NULL, "," );
                                        continue;
                                }
 
                                /* Ist der Channel "invite-only"? */
-                               if(( strchr( Channel_Modes( chan ), 'i' ) != NULL ) && ( is_invited == FALSE ))
+                               if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
                                {
                                        /* Channel ist "invite-only" und Client wurde nicht invited: */
                                        IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
 
-                                       /* naechsten Namen ermitteln */
+                                       /* Try next name, if any */
+                                       channame = strtok( NULL, "," );
+                                       continue;
+                               }
+
+                               /* Is the channel protected by a key? */
+                               if(( strchr( Channel_Modes( chan ), 'k' )) && ( strcmp( Channel_Key( chan ), key ? key : "" ) != 0 ))
+                               {
+                                       /* Bad channel key! */
+                                       IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
+
+                                       /* Try next name, if any */
+                                       channame = strtok( NULL, "," );
+                                       continue;
+                               }
+
+                               /* Are there already too many members? */
+                               if(( strchr( Channel_Modes( chan ), 'l' )) && ( Channel_MaxUsers( chan ) <= Channel_MemberCount( chan )))
+                               {
+                                       /* Bad channel key! */
+                                       IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
+
+                                       /* Try next name, if any */
                                        channame = strtok( NULL, "," );
                                        continue;
                                }