X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flists.c;h=e16cdd7087ad1e3f1e0a23e7853e706cc1b43bc9;hb=06caecb0c4ed9d4d8f237eab4469531e8c96bbf4;hp=cc0538e910707a330c7d1864bfe5b96a5d4970d4;hpb=57c7e2362284c8c9937f32944ec985b53b1b07d6;p=ngircd-alex.git

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index cc0538e9..e16cdd70 100644
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
  *
  * 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
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: lists.c,v 1.12 2004/01/17 03:17:49 alex Exp $";
+static char UNUSED id[] = "$Id: lists.c,v 1.17 2005/03/19 18:43:49 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -42,24 +42,24 @@ static char UNUSED id[] = "$Id: lists.c,v 1.12 2004/01/17 03:17:49 alex Exp $";
 typedef struct _C2C
 {
 	struct _C2C *next;
-	CHAR mask[MASK_LEN];
+	char mask[MASK_LEN];
 	CHANNEL *channel;
-	BOOLEAN onlyonce;
+	bool onlyonce;
 } C2C;
 
 
 LOCAL C2C *My_Invites, *My_Bans;
 
 
-LOCAL C2C *New_C2C PARAMS(( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
+LOCAL C2C *New_C2C PARAMS(( char *Mask, CHANNEL *Chan, bool OnlyOnce ));
 
-LOCAL BOOLEAN Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
-LOCAL BOOLEAN Already_Registered PARAMS(( C2C *Cl2Chan, CHAR *Mask, CHANNEL *Chan ));
+LOCAL bool Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
+LOCAL bool Already_Registered PARAMS(( C2C *Cl2Chan, char *Mask, CHANNEL *Chan ));
 
 
 
-GLOBAL VOID
-Lists_Init( VOID )
+GLOBAL void
+Lists_Init( void )
 {
 	/* Modul initialisieren */
 
@@ -67,8 +67,8 @@ Lists_Init( VOID )
 } /* Lists_Init */
 
 
-GLOBAL VOID
-Lists_Exit( VOID )
+GLOBAL void
+Lists_Exit( void )
 {
 	/* Modul abmelden */
 
@@ -94,33 +94,38 @@ Lists_Exit( VOID )
 } /* Lists_Exit */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan )
 {
 	return Check_List( &My_Invites, Client, Chan );
 } /* Lists_CheckInvited */
 
 
-GLOBAL BOOLEAN
-Lists_AddInvited( CLIENT *From, CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+GLOBAL bool
+Lists_IsInviteEntry( char *Mask, CHANNEL *Chan )
+{
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+	
+	return Already_Registered( My_Invites, Mask, Chan );
+} /* Lists_IsInviteEntry */
+
+
+GLOBAL bool
+Lists_AddInvited( char *Mask, CHANNEL *Chan, bool OnlyOnce )
 {
 	C2C *c2c;
 
 	assert( Mask != NULL );
 	assert( Chan != NULL );
 
-	if( Already_Registered( My_Invites, Mask, Chan ))
-	{
-		/* Eintrag ist bereits vorhanden */
-		IRC_WriteStrClient( From, RPL_INVITELIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask );
-		return FALSE;
-	}
+	if( Already_Registered( My_Invites, Mask, Chan )) return true;
 	
 	c2c = New_C2C( Mask, Chan, OnlyOnce );
 	if( ! c2c )
 	{
 		Log( LOG_ERR, "Can't add new invite list entry!" );
-		return FALSE;
+		return false;
 	}
 
 	/* verketten */
@@ -128,12 +133,12 @@ Lists_AddInvited( CLIENT *From, CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 	My_Invites = c2c;
 
 	Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Mask, Channel_Name( Chan ));
-	return TRUE;
+	return true;
 } /* Lists_AddInvited */
 
 
-GLOBAL VOID
-Lists_DelInvited( CHAR *Mask, CHANNEL *Chan )
+GLOBAL void
+Lists_DelInvited( char *Mask, CHANNEL *Chan )
 {
 	C2C *c2c, *last, *next;
 
@@ -159,7 +164,7 @@ Lists_DelInvited( CHAR *Mask, CHANNEL *Chan )
 } /* Lists_DelInvited */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 Lists_ShowInvites( CLIENT *Client, CHANNEL *Channel )
 {
 	C2C *c2c;
@@ -181,33 +186,72 @@ Lists_ShowInvites( CLIENT *Client, CHANNEL *Channel )
 } /* Lists_ShowInvites */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
+Lists_SendInvites( CLIENT *Client )
+{
+	C2C *c2c;
+	
+	assert( Client != NULL );
+	
+	c2c = My_Invites;
+	while( c2c )
+	{
+		if( ! IRC_WriteStrClient( Client, "MODE %s +I %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED;
+		c2c = c2c->next;
+	}
+	return CONNECTED;
+} /* Lists_SendInvites */
+
+
+GLOBAL bool
+Lists_SendBans( CLIENT *Client )
+{
+	C2C *c2c;
+	
+	assert( Client != NULL );
+	
+	c2c = My_Bans;
+	while( c2c )
+	{
+		if( ! IRC_WriteStrClient( Client, "MODE %s +b %s", Channel_Name( c2c->channel ), c2c->mask )) return DISCONNECTED;
+		c2c = c2c->next;
+	}
+	return CONNECTED;
+} /* Lists_SendBans */
+
+
+GLOBAL bool
 Lists_CheckBanned( CLIENT *Client, CHANNEL *Chan )
 {
 	return Check_List( &My_Bans, Client, Chan );
 } /* Lists_CheckBanned */
 
 
-GLOBAL BOOLEAN
-Lists_AddBanned( CLIENT *From, CHAR *Mask, CHANNEL *Chan )
+GLOBAL bool
+Lists_IsBanEntry( char *Mask, CHANNEL *Chan )
+{
+	assert( Mask != NULL );
+	assert( Chan != NULL );
+	
+	return Already_Registered( My_Bans, Mask, Chan );
+} /* Lists_IsBanEntry */
+
+
+GLOBAL bool
+Lists_AddBanned( char *Mask, CHANNEL *Chan )
 {
 	C2C *c2c;
 
 	assert( Mask != NULL );
 	assert( Chan != NULL );
 
-	if( Already_Registered( My_Bans, Mask, Chan ))
-	{
-		/* Eintrag ist bereits vorhanden */
-		IRC_WriteStrClient( From, RPL_BANLIST_MSG, Client_ID( From ), Channel_Name( Chan ), Mask );
-		return FALSE;
-	}
+	if( Already_Registered( My_Bans, Mask, Chan )) return true;
 
-	c2c = New_C2C( Mask, Chan, FALSE );
+	c2c = New_C2C( Mask, Chan, false );
 	if( ! c2c )
 	{
 		Log( LOG_ERR, "Can't add new ban list entry!" );
-		return FALSE;
+		return false;
 	}
 
 	/* verketten */
@@ -215,12 +259,12 @@ Lists_AddBanned( CLIENT *From, CHAR *Mask, CHANNEL *Chan )
 	My_Bans = c2c;
 
 	Log( LOG_DEBUG, "Added \"%s\" to ban list for \"%s\".", Mask, Channel_Name( Chan ));
-	return TRUE;
+	return true;
 } /* Lists_AddBanned */
 
 
-GLOBAL VOID
-Lists_DelBanned( CHAR *Mask, CHANNEL *Chan )
+GLOBAL void
+Lists_DelBanned( char *Mask, CHANNEL *Chan )
 {
 	C2C *c2c, *last, *next;
 
@@ -246,7 +290,7 @@ Lists_DelBanned( CHAR *Mask, CHANNEL *Chan )
 } /* Lists_DelBanned */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 Lists_ShowBans( CLIENT *Client, CHANNEL *Channel )
 {
 	C2C *c2c;
@@ -268,7 +312,7 @@ Lists_ShowBans( CLIENT *Client, CHANNEL *Channel )
 } /* Lists_ShowBans */
 
 
-GLOBAL VOID
+GLOBAL void
 Lists_DeleteChannel( CHANNEL *Chan )
 {
 	/* Channel wurde geloescht, Invite- und Ban-Lists aufraeumen */
@@ -313,15 +357,16 @@ Lists_DeleteChannel( CHANNEL *Chan )
 } /* Lists_DeleteChannel */
 
 
-GLOBAL CHAR *
-Lists_MakeMask( CHAR *Pattern )
+GLOBAL char *
+Lists_MakeMask( char *Pattern )
 {
-	/* Hier wird aus einem "beliebigen" Pattern eine gueltige IRC-Mask erzeugt.
-	 * Diese ist aber nur bis zum naechsten Aufruf von Lists_MakeMask() gueltig,
-	 * da ein einziger globaler Puffer verwendet wird. ->Umkopieren!*/
+	/* This function generats a valid IRC mask of "any" string. This
+	 * mask is only valid until the next call to Lists_MakeMask(),
+	 * because a single global buffer is used. You have to copy the
+	 * generated mask to some sane location yourself! */
 
-	STATIC CHAR TheMask[MASK_LEN];
-	CHAR *excl, *at;
+	static char TheMask[MASK_LEN];
+	char *excl, *at;
 
 	assert( Pattern != NULL );
 
@@ -332,7 +377,7 @@ Lists_MakeMask( CHAR *Pattern )
 
 	if(( ! at ) && ( ! excl ))
 	{
-		/* weder ! noch @ vorhanden: als Nick annehmen */
+		/* Neither "!" nor "@" found: use string as nick name */
 		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
 		strlcat( TheMask, "!*@*", sizeof( TheMask ));
 		return TheMask;
@@ -340,7 +385,7 @@ Lists_MakeMask( CHAR *Pattern )
 
 	if(( ! at ) && ( excl ))
 	{
-		/* Domain fehlt */
+		/* Domain part is missing */
 		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 3 );
 		strlcat( TheMask, "@*", sizeof( TheMask ));
 		return TheMask;
@@ -348,22 +393,22 @@ Lists_MakeMask( CHAR *Pattern )
 
 	if(( at ) && ( ! excl ))
 	{
-		/* User fehlt */
+		/* User name is missing */
 		*at = '\0'; at++;
-		strlcpy( TheMask, Pattern, sizeof( TheMask ) - strlen( at ) - 4 );
+		strlcpy( TheMask, Pattern, sizeof( TheMask ) - 5 );
 		strlcat( TheMask, "!*@", sizeof( TheMask ));
 		strlcat( TheMask, at, sizeof( TheMask ));
 		return TheMask;
 	}
 
-	/* alle Teile vorhanden */
+	/* All parts (nick, user and domain name) are given */
 	strlcpy( TheMask, Pattern, sizeof( TheMask ));
 	return TheMask;
 } /* Lists_MakeMask */
 
 
 LOCAL C2C *
-New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+New_C2C( char *Mask, CHANNEL *Chan, bool OnlyOnce )
 {
 	C2C *c2c;
 	
@@ -371,7 +416,7 @@ New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 	assert( Chan != NULL );
 
 	/* Speicher fuer Eintrag anfordern */
-	c2c = malloc( sizeof( C2C ));
+	c2c = (C2C *)malloc( sizeof( C2C ));
 	if( ! c2c )
 	{
 		Log( LOG_EMERG, "Can't allocate memory! [New_C2C]" );
@@ -386,7 +431,7 @@ New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 } /* New_C2C */
 
 
-LOCAL BOOLEAN
+LOCAL bool
 Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
 {
 	C2C *c2c, *last;
@@ -414,29 +459,29 @@ Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
 					else *Cl2Chan = c2c->next;
 					free( c2c );
 				}
-				return TRUE;
+				return true;
 			}
 		}
 		last = c2c;
 		c2c = c2c->next;
 	}
 
-	return FALSE;
+	return false;
 } /* Check_List */
 
 
-LOCAL BOOLEAN
-Already_Registered( C2C *List, CHAR *Mask, CHANNEL *Chan )
+LOCAL bool
+Already_Registered( C2C *List, char *Mask, CHANNEL *Chan )
 {
 	C2C *c2c;
 
 	c2c = List;
 	while( c2c )
 	{
-		if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 )) return TRUE;
+		if(( c2c->channel == Chan ) && ( strcasecmp( c2c->mask, Mask ) == 0 )) return true;
 		c2c = c2c->next;
 	}
-	return FALSE;
+	return false;
 } /* Already_Registered */