- neue Funktionen Channel_FirstChannelOf() und Channel_NextChannelOf().

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 3f140064647f44241609bfb928793ee50670b974..028aecb1fdc61e5f899ccdb55c324b535547b1ee 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,11 +9,26 @@
  * 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.6 2002/01/26 18:41:55 alex Exp $
+ * $Id: channel.c,v 1.11 2002/01/29 00:11:10 alex Exp $
  *
  * channel.c: Management der Channels
  *
  * $Log: channel.c,v $
+ * Revision 1.11  2002/01/29 00:11:10  alex
+ * - neue Funktionen Channel_FirstChannelOf() und Channel_NextChannelOf().
+ *
+ * Revision 1.10  2002/01/28 01:16:15  alex
+ * - neue Funktionen Channel_Name(), Channel_First() und Channel_Next().
+ *
+ * Revision 1.9  2002/01/27 22:47:11  alex
+ * - PART wird nicht mehr an den Server verschickt, von dem es empfangen wurde.
+ *
+ * Revision 1.8  2002/01/27 21:56:54  alex
+ * - weitere Anpassungen an Chennals, v.a. ueber Server-Links.
+ *
+ * Revision 1.7  2002/01/27 17:14:33  alex
+ * - diverse Aenderungen fuer Channels ueber mehrere Server.
+ *
  * Revision 1.6  2002/01/26 18:41:55  alex
  * - CHANNEL- und CL2CHAN-Strukturen in Header verlegt,
  * - einige neue Funktionen (Channel_GetChannel(), Channel_FirstMember(), ...)
@@ -64,7 +79,7 @@ LOCAL CL2CHAN *My_Cl2Chan;
 LOCAL CHANNEL *New_Chan( CHAR *Name );
 LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client );
 LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client );
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason );
+LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART );
 LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan );
 LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan );
 LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan );
@@ -156,7 +171,7 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R
        }
 
        /* User aus Channel entfernen */
-       if( ! Remove_Client( chan, Client, Origin, Reason )) return FALSE;
+       if( ! Remove_Client( chan, Client, Origin, Reason, TRUE )) return FALSE;
        else return TRUE;
 } /* Channel_Part */
 
@@ -171,7 +186,7 @@ GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason )
        while( c )
        {
                next_c = c->next;
-               Remove_Client( c, Client, Client_ThisServer( ), Reason );
+               Remove_Client( c, Client, Client_ThisServer( ), Reason, FALSE );
                c = next_c;
        }
 } /* Channel_RemoveClient */
@@ -193,6 +208,26 @@ GLOBAL INT Channel_Count( VOID )
 } /* Channel_Count */
 
 
+GLOBAL CHAR *Channel_Name( CHANNEL *Chan )
+{
+       assert( Chan != NULL );
+       return Chan->name;
+} /* Channel_Name */
+
+
+GLOBAL CHANNEL *Channel_First( VOID )
+{
+       return My_Channels;
+} /* Channel_First */
+
+
+GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan )
+{
+       assert( Chan != NULL );
+       return Chan->next;
+} /* Channel_Next */
+
+
 GLOBAL CHANNEL *Channel_Search( CHAR *Name )
 {
        /* Channel-Struktur suchen */
@@ -214,7 +249,7 @@ GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan )
 {
        assert( Chan != NULL );
        return Get_First_Cl2Chan( NULL, Chan );
-} /* Channel_IsMember */
+} /* Channel_FirstMember */
 
 
 GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
@@ -225,6 +260,21 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 } /* Channel_NextMember */
 
 
+GLOBAL CL2CHAN *Channel_FirstChannelOf( CLIENT *Client )
+{
+       assert( Client != NULL );
+       return Get_First_Cl2Chan( Client, NULL );
+} /* Channel_FirstChannelOf */
+
+
+GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
+{
+       assert( Client != NULL );
+       assert( Cl2Chan != NULL );
+       return Get_Next_Cl2Chan( Cl2Chan->next, Client, NULL );
+} /* Channel_NextChannelOf */
+
+
 GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan )
 {
        assert( Cl2Chan != NULL );
@@ -300,12 +350,14 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
        /* Verketten */
        cl2chan->next = My_Cl2Chan;
        My_Cl2Chan = cl2chan;
-       
+
+       Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name );
+
        return cl2chan;
 } /* Add_Client */
 
 
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason )
+LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART )
 {
        CL2CHAN *cl2chan, *last_cl2chan;
        CHANNEL *c;
@@ -333,9 +385,9 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
        else My_Cl2Chan = cl2chan->next;
        free( cl2chan );
 
-       if( Client_Conn( Origin ) > NONE ) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-       IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-       IRC_WriteStrChannelPrefix( Origin, c, Client, "PART %s :%s", c->name, Reason );
+       if( ServerPART ) 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 );
 
        Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );