- neues Modul "match" begonnen.

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 35aaa01cb49d3504c5ec809134f39922048b30aa..38dc4684acef6109138b7ccda346dc6240bf5e1b 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.c,v 1.25 2002/06/01 14:35:39 alex Exp $
+ * $Id: channel.c,v 1.28 2002/06/09 13:15:58 alex Exp $
  *
  * channel.c: Management der Channels
  */
@@ -36,6 +36,7 @@
 #include "resolve.h"
 #include "conf.h"
 #include "hash.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 
@@ -63,14 +64,20 @@ LOCAL BOOLEAN Delete_Channel PARAMS(( CHANNEL *Chan ));
 GLOBAL VOID
 Channel_Init( VOID )
 {
-       CHANNEL *chan;
-       CHAR *c;
-       INT i;
-       
        My_Channels = NULL;
        My_Cl2Chan = NULL;
+} /* Channel_Init */
+
 
+GLOBAL VOID
+Channel_InitPredefined( VOID )
+{
        /* Vordefinierte persistente Channels erzeugen */
+
+       CHANNEL *chan;
+       CHAR *c;
+       INT i;
+       
        for( i = 0; i < Conf_Channel_Count; i++ )
        {
                /* Ist ein Name konfiguriert? */
@@ -98,7 +105,7 @@ Channel_Init( VOID )
                }
                else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
        }
-} /* Channel_Init */
+} /* Channel_InitPredefined */
 
 
 GLOBAL VOID
@@ -244,7 +251,7 @@ Channel_Quit( CLIENT *Client, CHAR *Reason )
        while( c )
        {
                next_c = c->next;
-               Remove_Client( REMOVE_QUIT, c, Client, Client_ThisServer( ), Reason, FALSE );
+               Remove_Client( REMOVE_QUIT, c, Client, Client, Reason, FALSE );
                c = next_c;
        }
 } /* Channel_Quit */
@@ -610,7 +617,7 @@ New_Chan( CHAR *Name )
        c = malloc( sizeof( CHANNEL ));
        if( ! c )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
                return NULL;
        }
        c->next = NULL;
@@ -656,7 +663,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
        cl2chan = malloc( sizeof( CL2CHAN ));
        if( ! cl2chan )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );
                return NULL;
        }
        cl2chan->channel = Chan;
@@ -705,17 +712,22 @@ Remove_Client( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Re
        switch( Type )
        {
                case REMOVE_QUIT:
+                       /* QUIT: andere Server wurden bereits informiert, vgl. Client_Destroy();
+                        * hier also "nur" noch alle User in betroffenen Channeln infomieren */
                        assert( InformServer == FALSE );
                        IRC_WriteStrChannelPrefix( Origin, c, Origin, FALSE, "QUIT :%s", Reason );
                        Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
                        break;
                case REMOVE_KICK:
+                       /* User wurde geKICKed: ggf. andere Server sowie alle betroffenen User
+                        * im entsprechenden Channel informieren */
                        if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
                        IRC_WriteStrChannelPrefix( Client, c, Origin, FALSE, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
                        if(( Client_Conn( Client ) > NONE ) && ( Client_Type( Client ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
                        Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason );
                        break;
                default:
+                       /* PART */
                        if( InformServer ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
                        IRC_WriteStrChannelPrefix( Origin, c, Client, FALSE, "PART %s :%s", c->name, Reason );
                        if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
@@ -776,6 +788,9 @@ Delete_Channel( CHANNEL *Chan )
 
        Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
+       /* Invite- und Ban-Lists aufraeumen */
+       Lists_DeleteChannel( chan );
+
        /* Neu verketten und freigeben */
        if( last_chan ) last_chan->next = chan->next;
        else My_Channels = chan->next;