- fixed up Channel_PCount() and Channel_CountForUser().

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index e35878f286f7fabc2956d123a76ea81a5cb4ceaa..386aaa2a1ad7f5166a31490746b822356e32f56c 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -2,16 +2,13 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: channel.c,v 1.30 2002/08/26 23:47:58 alex Exp $
- *
- * channel.c: Management der Channels
+ * Channel management
  */
 
 
@@ -20,6 +17,8 @@
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: channel.c,v 1.37 2002/12/14 13:21:56 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -52,7 +51,6 @@ LOCAL CHANNEL *My_Channels;
 LOCAL CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CHANNEL *New_Chan PARAMS(( CHAR *Name ));
 LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
 LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
 LOCAL BOOLEAN Remove_Client PARAMS(( INT Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN InformServer ));
@@ -81,7 +79,7 @@ Channel_InitPredefined( VOID )
        for( i = 0; i < Conf_Channel_Count; i++ )
        {
                /* Ist ein Name konfiguriert? */
-               if( ! Conf_Channel[i].name ) continue;
+               if( ! Conf_Channel[i].name[0] ) continue;
 
                /* Gueltiger Channel-Name? */
                if( ! Channel_IsValidName( Conf_Channel[i].name ))
@@ -89,14 +87,19 @@ Channel_InitPredefined( VOID )
                        Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
                        continue;
                }
+
+               /* Gibt es den Channel bereits? */
+               chan = Channel_Search( Conf_Channel[i].name );
+               if( chan )
+               {
+                       Log( LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", Conf_Channel[i].name );
+                       continue;
+               }
                
                /* Channel anlegen */
-               chan = New_Chan( Conf_Channel[i].name );
+               chan = Channel_Create( Conf_Channel[i].name );
                if( chan )
                {
-                       /* Verketten */
-                       chan->next = My_Channels;
-                       My_Channels = chan;
                        Channel_ModeAdd( chan, 'P' );
                        Channel_SetTopic( chan, Conf_Channel[i].topic );
                        c = Conf_Channel[i].modes;
@@ -159,12 +162,8 @@ Channel_Join( CLIENT *Client, CHAR *Name )
        else
        {
                /* Gibt es noch nicht? Dann neu anlegen: */
-               chan = New_Chan( Name );
+               chan = Channel_Create( Name );
                if( ! chan ) return FALSE;
-
-               /* Verketten */
-               chan->next = My_Channels;
-               My_Channels = chan;
        }
 
        /* User dem Channel hinzufuegen */
@@ -257,11 +256,11 @@ Channel_Quit( CLIENT *Client, CHAR *Reason )
 } /* Channel_Quit */
 
 
-GLOBAL INT
+GLOBAL LONG
 Channel_Count( VOID )
 {
        CHANNEL *c;
-       INT count;
+       LONG count;
        
        count = 0;
        c = My_Channels;
@@ -274,11 +273,11 @@ Channel_Count( VOID )
 } /* Channel_Count */
 
 
-GLOBAL INT
+GLOBAL LONG
 Channel_MemberCount( CHANNEL *Chan )
 {
        CL2CHAN *cl2chan;
-       INT count;
+       LONG count;
 
        assert( Chan != NULL );
 
@@ -293,6 +292,48 @@ Channel_MemberCount( CHANNEL *Chan )
 } /* Channel_MemberCount */
 
 
+GLOBAL INT
+Channel_CountForUser( CLIENT *Client )
+{
+       /* Count number of channels a user is member of. */
+
+       CL2CHAN *cl2chan;
+       INT count;
+       
+       assert( Client != NULL );
+       
+       count = 0;
+       cl2chan = My_Cl2Chan;
+       while( cl2chan )
+       {
+               if( cl2chan->client == Client ) count++;
+               cl2chan = cl2chan->next;
+       }
+
+       return count;
+} /* Channel_CountForUser */
+
+
+GLOBAL INT
+Channel_PCount( VOID )
+{
+       /* Count the number of persistent (mode 'P') channels */
+
+       CHANNEL *chan;
+       INT count;
+
+       count = 0;
+       chan = My_Channels;
+       while( chan )
+       {
+               if( strchr( chan->modes, 'P' )) count++;
+               chan = chan->next;
+       }
+
+       return count;
+} /* Channel_PCount */
+
+
 GLOBAL CHAR *
 Channel_Name( CHANNEL *Chan )
 {
@@ -577,6 +618,18 @@ Channel_SetTopic( CHANNEL *Chan, CHAR *Topic )
 } /* Channel_SetTopic */
 
 
+GLOBAL VOID
+Channel_SetModes( CHANNEL *Chan, CHAR *Modes )
+{
+       assert( Chan != NULL );
+       assert( Modes != NULL );
+
+       strncpy( Chan->modes, Modes, CHANNEL_MODE_LEN - 1 );
+       Chan->topic[CHANNEL_MODE_LEN - 1] = '\0';
+} /* Channel_SetModes */
+
+
+
 GLOBAL BOOLEAN
 Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
 {
@@ -604,9 +657,8 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
 } /* Channel_Write */
 
 
-
-LOCAL CHANNEL *
-New_Chan( CHAR *Name )
+GLOBAL CHANNEL *
+Channel_Create( CHAR *Name )
 {
        /* Neue Channel-Struktur anlegen */
 
@@ -627,10 +679,14 @@ New_Chan( CHAR *Name )
        strcpy( c->topic, "" );
        c->hash = Hash( c->name );
 
+       /* Verketten */
+       c->next = My_Channels;
+       My_Channels = c;
+       
        Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
        
        return c;
-} /* New_Chan */
+} /* Channel_Create */
 
 
 LOCAL CL2CHAN *