- PART wird nicht mehr an den Server verschickt, von dem es empfangen wurde.

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index d1b01daf6bba87e35a6fab8c36ba55b748db1d59..c6dc0ca998df18d899c100e222d2097082009f2c 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,11 +9,24 @@
  * 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.5 2002/01/21 00:12:29 alex Exp $
+ * $Id: channel.c,v 1.9 2002/01/27 22:47:11 alex Exp $
  *
  * channel.c: Management der Channels
  *
  * $Log: channel.c,v $
+ * 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(), ...)
+ *
  * Revision 1.5  2002/01/21 00:12:29  alex
  * - begonnen, Channels zu implementieren :-)
  *
@@ -33,6 +46,9 @@
  */
 
 
+#define __channel_c__
+
+
 #include <portab.h>
 #include "global.h"
 
@@ -50,32 +66,14 @@
 #include "channel.h"
 
 
-typedef struct _CHANNEL
-{
-       struct _CHANNEL *next;
-       CHAR name[CHANNEL_NAME_LEN];    /* Name des Channel */
-       CHAR modes[CHANNEL_MODE_LEN];   /* Channel-Modes */
-} CHANNEL;
-
-
-typedef struct _CLIENT2CHAN
-{
-       struct _CLIENT2CHAN *next;
-       CLIENT *client;
-       CHANNEL *channel;
-       CHAR modes[CHANNEL_MODE_LEN];   /* User-Modes in dem Channel */
-} CL2CHAN;
-
-
 LOCAL CHANNEL *My_Channels;
 LOCAL CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CHANNEL *Get_Chan( CHAR *Name );
 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 );
@@ -128,7 +126,7 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
        }
 
        /* Channel suchen */
-       chan = Get_Chan( Name );
+       chan = Channel_Search( Name );
        if( chan )
        {
                /* Ist der Client bereits Mitglied? */
@@ -159,7 +157,7 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R
        assert( Name != NULL );
 
        /* Channel suchen */
-       chan = Get_Chan( Name );
+       chan = Channel_Search( Name );
        if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client )))
        {
                IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
@@ -167,7 +165,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 */
 
@@ -182,7 +180,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 */
@@ -204,7 +202,7 @@ GLOBAL INT Channel_Count( VOID )
 } /* Channel_Count */
 
 
-LOCAL CHANNEL *Get_Chan( CHAR *Name )
+GLOBAL CHANNEL *Channel_Search( CHAR *Name )
 {
        /* Channel-Struktur suchen */
        
@@ -218,7 +216,36 @@ LOCAL CHANNEL *Get_Chan( CHAR *Name )
                c = c->next;
        }
        return NULL;
-} /* Get_Chan */
+} /* Channel_Search */
+
+
+GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan )
+{
+       assert( Chan != NULL );
+       return Get_First_Cl2Chan( NULL, Chan );
+} /* Channel_IsMember */
+
+
+GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
+{
+       assert( Chan != NULL );
+       assert( Cl2Chan != NULL );
+       return Get_Next_Cl2Chan( Cl2Chan->next, NULL, Chan );
+} /* Channel_NextMember */
+
+
+GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan )
+{
+       assert( Cl2Chan != NULL );
+       return Cl2Chan->client;
+} /* Channel_GetClient */
+
+
+GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan )
+{
+       assert( Cl2Chan != NULL );
+       return Cl2Chan->channel;
+} /* Channel_GetChannel */
 
 
 LOCAL CHANNEL *New_Chan( CHAR *Name )
@@ -282,12 +309,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;
@@ -315,8 +344,9 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
        else My_Cl2Chan = cl2chan->next;
        free( cl2chan );
 
-       IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-       IRC_WriteStrRelatedChannelPrefix( Origin, c->name, 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 );