X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=926d345e9dbf5267302e6a59a0699afb33e01f21;hp=34dbe5e5dbd3c104da9c0be640fc9ec9ae8326e0;hb=902ad91212f3d756fa898239108128d2230bdc0c;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 34dbe5e5..926d345e 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.18 2002/12/12 12:24:18 alex Exp $";
+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>
@@ -31,6 +31,8 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.18 2002/12/12 12:24:18 alex Ex
 #include "parse.h"
 #include "irc-info.h"
 #include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
 
 #include "exp.h"
 #include "irc-channel.h"
@@ -39,7 +41,7 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.18 2002/12/12 12:24:18 alex Ex
 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;
@@ -47,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], "," );
@@ -81,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 )
 			{
@@ -102,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;
 				}