moved invite/ban lists to channel structure

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 2d656c8684c720e207dd744576160caff130b3f2..777ba20fb764c76bee3b36531c9bd11733110ddb 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.57 2006/08/12 11:58:21 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.60 2006/12/07 17:57:20 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -70,6 +70,22 @@ Channel_Init( void )
 } /* Channel_Init */
 
 
+GLOBAL struct list_head *
+Channel_GetListBans(CHANNEL *c)
+{
+       assert(c != NULL);
+       return &c->list_bans;
+}
+
+
+GLOBAL struct list_head *
+Channel_GetListInvites(CHANNEL *c)
+{
+       assert(c != NULL);
+       return &c->list_invites;
+}
+
+
 GLOBAL void
 Channel_InitPredefined( void )
 {
@@ -265,11 +281,11 @@ Channel_Quit( CLIENT *Client, char *Reason )
 } /* Channel_Quit */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Channel_Count( void )
 {
        CHANNEL *c;
-       long count = 0;
+       unsigned long count = 0;
        
        c = My_Channels;
        while( c )
@@ -281,11 +297,11 @@ Channel_Count( void )
 } /* Channel_Count */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Channel_MemberCount( CHANNEL *Chan )
 {
        CL2CHAN *cl2chan;
-       long count = 0;
+       unsigned long count = 0;
 
        assert( Chan != NULL );
 
@@ -339,8 +355,8 @@ Channel_PCount( void )
 } /* Channel_PCount */
 
 
-GLOBAL char *
-Channel_Name( CHANNEL *Chan )
+GLOBAL const char *
+Channel_Name( const CHANNEL *Chan )
 {
        assert( Chan != NULL );
        return Chan->name;
@@ -363,7 +379,7 @@ Channel_Key( CHANNEL *Chan )
 } /* Channel_Key */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Channel_MaxUsers( CHANNEL *Chan )
 {
        assert( Chan != NULL );
@@ -462,25 +478,13 @@ Channel_GetChannel( CL2CHAN *Cl2Chan )
 
 
 GLOBAL bool
-Channel_IsValidName( char *Name )
+Channel_IsValidName( const char *Name )
 {
-       /* Pruefen, ob Name als Channelname gueltig */
-
-       char *ptr, badchars[10];
-       
        assert( Name != NULL );
 
        if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false;
 
-       ptr = Name;
-       strcpy( badchars, " ,:\007" );
-       while( *ptr )
-       {
-               if( strchr( badchars, *ptr )) return false;
-               ptr++;
-       }
-       
-       return true;
+       return Name[strcspn(Name, " ,:\007")] == 0;
 } /* Channel_IsValidName */
 
 
@@ -699,7 +703,7 @@ Channel_SetKey( CHANNEL *Chan, char *Key )
 
 
 GLOBAL void
-Channel_SetMaxUsers( CHANNEL *Chan, long Count )
+Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count)
 {
        assert( Chan != NULL );
 
@@ -726,9 +730,9 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text )
        ok = true;
        if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = false;
        if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = false;
-       
+
        /* Is the client banned? */
-       if( Lists_CheckBanned( From, Chan ))
+       if( Lists_Check(&Chan->list_bans, From))
        {
                /* Client is banned, but is he channel operator or has voice? */
                if(( ! has_voice ) && ( ! is_op )) ok = false;
@@ -893,6 +897,68 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
 } /* Remove_Client */
 
 
+GLOBAL bool
+Channel_AddBan(CHANNEL *c, const char *mask )
+{
+       struct list_head *h = Channel_GetListBans(c);
+       return Lists_Add(h, mask, false);
+}
+
+
+GLOBAL bool
+Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
+{
+       struct list_head *h = Channel_GetListInvites(c);
+       return Lists_Add(h, mask, onlyonce);
+}
+
+
+static bool
+ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite)
+{
+       struct list_elem *e;
+       char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG;
+       char *msg_end;
+
+       assert( Client != NULL );
+       assert( Channel != NULL );
+
+       e = Lists_GetFirst(head);
+       while (e) {
+               if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ),
+                               Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED;
+               e = Lists_GetNext(e);
+       }
+
+       msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG;
+       return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel ));
+}
+
+
+GLOBAL bool
+Channel_ShowBans( CLIENT *Client, CHANNEL *Channel )
+{
+       struct list_head *h;
+
+       assert( Channel != NULL );
+
+       h = Channel_GetListBans(Channel);
+       return ShowInvitesBans(h, Client, Channel, false);
+}
+
+
+GLOBAL bool
+Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
+{
+       struct list_head *h;
+
+       assert( Channel != NULL );
+
+       h = Channel_GetListInvites(Channel);
+       return ShowInvitesBans(h, Client, Channel, true);
+}
+
+
 static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
@@ -922,7 +988,7 @@ static bool
 Delete_Channel( CHANNEL *Chan )
 {
        /* Channel-Struktur loeschen */
-       
+
        CHANNEL *chan, *last_chan;
 
        last_chan = NULL;
@@ -938,13 +1004,14 @@ Delete_Channel( CHANNEL *Chan )
        Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
        /* Invite- und Ban-Lists aufraeumen */
-       Lists_DeleteChannel( chan );
+       Lists_Free( &chan->list_bans );
+       Lists_Free( &chan->list_invites );
 
        /* Neu verketten und freigeben */
        if( last_chan ) last_chan->next = chan->next;
        else My_Channels = chan->next;
        free( chan );
-               
+
        return true;
 } /* Delete_Channel */