X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=dc37ad00c83ed5dee4dbc047a6e8b1ce234484ff;hb=1d3def0cc6271ff77b39deec07eee240e1968d52;hp=0340d3f8cdfdecefa882bbe4d09373af7ee3e34b;hpb=81cc5f82b50de80bff9d2d1c37fc726baea5fac5;p=ngircd-alex.git

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 0340d3f8..dc37ad00 100644
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -36,18 +36,19 @@
 #include "irc-mode.h"
 
 
-static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin,
-	CLIENT *Target ));
-static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin,
-	CHANNEL *Channel ));
+static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
+				CLIENT *Target));
+static bool Channel_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
+				 CHANNEL *Channel));
 
-static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client,
-	CHANNEL *Channel, const char *Pattern));
-static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client,
-	CHANNEL *Channel, const char *Pattern));
+static bool Add_To_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client,
+				CHANNEL *Channel, const char *Pattern));
+static bool Del_From_List PARAMS((char what, CLIENT *Prefix, CLIENT *Client,
+				  CHANNEL *Channel, const char *Pattern));
 
-static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix,
-	CLIENT *Client, CHANNEL *Channel, const char *Mask));
+static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar,
+				    CLIENT *Prefix, CLIENT *Client,
+				    CHANNEL *Channel, const char *Mask));
 
 
 /**
@@ -213,6 +214,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 		/* Validate modes */
 		x[0] = '\0';
 		switch (*mode_ptr) {
+		case 'C': /* Only messages from clients sharing a channel */
 		case 'i': /* Invisible */
 		case 's': /* Server messages */
 		case 'w': /* Wallops messages */
@@ -227,6 +229,14 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 							ERR_NOPRIVILEGES_MSG,
 							Client_ID(Origin));
 			break;
+		case 'B': /* Bot */
+			if (Client_HasMode(Client, 'r'))
+				ok = IRC_WriteStrClient(Origin,
+							ERR_RESTRICTED_MSG,
+							Client_ID(Origin));
+			else
+				x[0] = 'B';
+			break;
 		case 'c': /* Receive connect notices
 			   * (only settable by IRC operators!) */
 			if (!set || Client_Type(Client) == CLIENT_SERVER
@@ -254,6 +264,14 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 							ERR_RESTRICTED_MSG,
 							Client_ID(Origin));
 			break;
+		case 'R': /* Registered (not [un]settable by clients) */
+			if (Client_Type(Client) == CLIENT_SERVER)
+				x[0] = 'R';
+			else
+				ok = IRC_WriteStrClient(Origin,
+							ERR_NICKREGISTER_MSG,
+							Client_ID(Origin));
+			break;
 		case 'x': /* Cloak hostname */
 			if (Client_HasMode(Client, 'r'))
 				ok = IRC_WriteStrClient(Origin,
@@ -498,6 +516,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 		switch (*mode_ptr) {
 		/* --- Channel modes --- */
 		case 'i': /* Invite only */
+		case 'M': /* Only identified nicks can write */
 		case 'm': /* Moderated */
 		case 'n': /* Only members can write */
 		case 'R': /* Registered users only */
@@ -660,16 +679,17 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 		/* --- Channel lists --- */
 		case 'I': /* Invite lists */
 		case 'b': /* Ban lists */
+		case 'e': /* Channel exception lists */
 			if (Mode_Limit_Reached(Client, mode_arg_count++))
 				goto chan_exit;
 			if (arg_arg > mode_arg) {
 				/* modify list */
 				if (modeok) {
 					connected = set
-					   ? Add_Ban_Invite(*mode_ptr, Origin,
+					   ? Add_To_List(*mode_ptr, Origin,
 						Client, Channel,
 						Req->argv[arg_arg])
-					   : Del_Ban_Invite(*mode_ptr, Origin,
+					   : Del_From_List(*mode_ptr, Origin,
 						Client, Channel,
 						Req->argv[arg_arg]);
 				} else {
@@ -681,10 +701,17 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 				Req->argv[arg_arg][0] = '\0';
 				arg_arg++;
 			} else {
-				if (*mode_ptr == 'I')
+				switch (*mode_ptr) {
+				case 'I':
 					Channel_ShowInvites(Origin, Channel);
-				else
+					break;
+				case 'b':
 					Channel_ShowBans(Origin, Channel);
+					break;
+				case 'e':
+					Channel_ShowExcepts(Origin, Channel);
+					break;
+				}
 			}
 			break;
 		default:
@@ -832,9 +859,9 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
 
 
 /**
- * Add entries to channel ban and invite lists.
+ * Add entries to channel invite, ban and exception lists.
  *
- * @param what Can be 'I' for invite or 'b' for ban list.
+ * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list.
  * @param Prefix The originator of the command.
  * @param Client The sender of the command.
  * @param Channel The channel of which the list should be modified.
@@ -842,38 +869,66 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
  * @return CONNECTED or DISCONNECTED.
  */
 static bool
-Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
-	       const char *Pattern)
+Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
+	    const char *Pattern)
 {
 	const char *mask;
+	struct list_head *list = NULL;
+	long int current_count;
 
 	assert(Client != NULL);
 	assert(Channel != NULL);
 	assert(Pattern != NULL);
-	assert(what == 'I' || what == 'b');
+	assert(what == 'I' || what == 'b' || what == 'e');
 
 	mask = Lists_MakeMask(Pattern);
+	current_count = Lists_Count(Channel_GetListInvites(Channel))
+			+ Lists_Count(Channel_GetListExcepts(Channel))
+			+ Lists_Count(Channel_GetListBans(Channel));
 
-	if (what == 'I') {
-		if (Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask))
-			return CONNECTED;
-		if (!Channel_AddInvite(Channel, mask, false))
-			return CONNECTED;
-		return Send_ListChange("+I", Prefix, Client, Channel, mask);
-	} else {
-		if (Lists_CheckDupeMask(Channel_GetListBans(Channel), mask))
-			return CONNECTED;
-		if (!Channel_AddBan(Channel, mask))
-			return CONNECTED;
-		return Send_ListChange("+b", Prefix, Client, Channel, mask);
+	switch(what) {
+		case 'I':
+			list = Channel_GetListInvites(Channel);
+			break;
+		case 'b':
+			list = Channel_GetListBans(Channel);
+			break;
+		case 'e':
+			list = Channel_GetListExcepts(Channel);
+			break;
 	}
+
+	if (Lists_CheckDupeMask(list, mask))
+		return CONNECTED;
+	if (Client_Type(Client) == CLIENT_USER &&
+	    current_count >= MAX_HNDL_CHANNEL_LISTS)
+		return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG,
+					  Client_ID(Client),
+					  Channel_Name(Channel), mask,
+					  MAX_HNDL_CHANNEL_LISTS);
+
+	switch (what) {
+		case 'I':
+			if (!Channel_AddInvite(Channel, mask, false))
+				return CONNECTED;
+			break;
+		case 'b':
+			if (!Channel_AddBan(Channel, mask))
+				return CONNECTED;
+			break;
+		case 'e':
+			if (!Channel_AddExcept(Channel, mask))
+				return CONNECTED;
+			break;
+	}
+	return Send_ListChange(true, what, Prefix, Client, Channel, mask);
 }
 
 
 /**
- * Delete entries from channel ban and invite lists.
+ * Delete entries from channel invite, ban and exeption lists.
  *
- * @param what Can be 'I' for invite or 'b' for ban list.
+ * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list.
  * @param Prefix The originator of the command.
  * @param Client The sender of the command.
  * @param Channel The channel of which the list should be modified.
@@ -881,52 +936,73 @@ Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
  * @return CONNECTED or DISCONNECTED.
  */
 static bool
-Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
-	       const char *Pattern)
+Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
+	      const char *Pattern)
 {
 	const char *mask;
+	struct list_head *list = NULL;
 
 	assert(Client != NULL);
 	assert(Channel != NULL);
 	assert(Pattern != NULL);
-	assert(what == 'I' || what == 'b');
+	assert(what == 'I' || what == 'b' || what == 'e');
 
 	mask = Lists_MakeMask(Pattern);
 
-	if (what == 'I') {
-		if (!Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask))
-			return CONNECTED;
-		Lists_Del(Channel_GetListInvites(Channel), mask);
-		return Send_ListChange( "-I", Prefix, Client, Channel, mask );
-	} else {
-		if (!Lists_CheckDupeMask(Channel_GetListBans(Channel), mask))
-			return CONNECTED;
-		Lists_Del(Channel_GetListBans(Channel), mask);
-		return Send_ListChange( "-b", Prefix, Client, Channel, mask );
+	switch (what) {
+		case 'I':
+			list = Channel_GetListInvites(Channel);
+			break;
+		case 'b':
+			list = Channel_GetListBans(Channel);
+			break;
+		case 'e':
+			list = Channel_GetListExcepts(Channel);
+			break;
 	}
 
+	if (!Lists_CheckDupeMask(list, mask))
+		return CONNECTED;
+	Lists_Del(list, mask);
+
+	return Send_ListChange(false, what, Prefix, Client, Channel, mask);
 }
 
 
+/**
+ * Send information about changed channel invite/ban/exception lists to clients.
+ *
+ * @param IsAdd true if the list item has been added, false otherwise.
+ * @param ModeChar The mode to use (e. g. 'b' or 'I')
+ * @param Prefix The originator of the mode list change.
+ * @param Client The sender of the command.
+ * @param Channel The channel of which the list has been modified.
+ * @param Mask The mask which has been added or removed.
+ * @return CONNECTED or DISCONNECTED.
+ */
 static bool
-Send_ListChange(const char *Mode, CLIENT *Prefix, CLIENT *Client,
-		CHANNEL *Channel, const char *Mask)
+Send_ListChange(const bool IsAdd, const char ModeChar, CLIENT *Prefix,
+		CLIENT *Client, CHANNEL *Channel, const char *Mask)
 {
-	bool ok;
+	bool ok = true;
 
-	if( Client_Type( Client ) == CLIENT_USER )
-	{
-		/* send confirmation to client */
-		ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
-	}
-	else ok = true;
+	/* Send confirmation to the client */
+	if (Client_Type(Client) == CLIENT_USER)
+		ok = IRC_WriteStrClientPrefix(Client, Prefix, "MODE %s %c%c %s",
+					      Channel_Name(Channel),
+					      IsAdd ? '+' : '-',
+					      ModeChar, Mask);
 
 	/* to other servers */
-	IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+	IRC_WriteStrServersPrefix(Client, Prefix, "MODE %s %c%c %s",
+				  Channel_Name(Channel), IsAdd ? '+' : '-',
+				  ModeChar, Mask);
 
 	/* and local users in channel */
-	IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
-	
+	IRC_WriteStrChannelPrefix(Client, Channel, Prefix, false,
+				  "MODE %s %c%c %s", Channel_Name(Channel),
+				  IsAdd ? '+' : '-', ModeChar, Mask );
+
 	return ok;
 } /* Send_ListChange */