remove ip-string from Conf_Server struct

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index d05095bb821f489bbc492b2541ce2626f15aa7de..3341cb49a70a27c35ab65bc1ef68a3f8a1e813ed 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.59 2006/10/06 21:32:58 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.63 2007/06/11 20:06:46 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 )
 {
@@ -115,6 +131,9 @@ Channel_InitPredefined( void )
                        while (*c)
                                Channel_ModeAdd(chan, *c++);
 
+                       Channel_SetKey(chan, Conf_Channel[i].key);
+                       Channel_SetMaxUsers(chan, Conf_Channel[i].maxusers);
+
                        Log(LOG_INFO, "Created pre-defined channel \"%s\".",
                                                        Conf_Channel[i].name );
                }
@@ -129,7 +148,7 @@ Channel_Exit( void )
 {
        CHANNEL *c, *c_next;
        CL2CHAN *cl2chan, *cl2chan_next;
-       
+
        /* Channel-Strukturen freigeben */
        c = My_Channels;
        while( c )
@@ -320,24 +339,6 @@ Channel_CountForUser( CLIENT *Client )
 } /* Channel_CountForUser */
 
 
-GLOBAL int
-Channel_PCount( void )
-{
-       /* Count the number of persistent (mode 'P') channels */
-
-       CHANNEL *chan;
-       int count = 0;
-
-       chan = My_Channels;
-       while( chan )
-       {
-               if( strchr( chan->modes, 'P' )) count++;
-               chan = chan->next;
-       }
-
-       return count;
-} /* Channel_PCount */
-
 
 GLOBAL const char *
 Channel_Name( const CHANNEL *Chan )
@@ -601,9 +602,7 @@ Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
 
        assert( Chan != NULL );
        assert( Client != NULL );
-
-       if( Get_Cl2Chan( Chan, Client )) return true;
-       else return false;
+       return Get_Cl2Chan(Chan, Client) != NULL;
 } /* Channel_IsMemberOf */
 
 
@@ -716,7 +715,7 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text )
        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;
@@ -881,6 +880,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 )
 {
@@ -910,7 +971,7 @@ static bool
 Delete_Channel( CHANNEL *Chan )
 {
        /* Channel-Struktur loeschen */
-       
+
        CHANNEL *chan, *last_chan;
 
        last_chan = NULL;
@@ -926,13 +987,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 */