X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=50cce094c1f7b448fc17645a65b66ffab2f7600f;hb=dd4535b7f14bef69039efde600f5d2f4540351cd;hp=66b075697853bac568d10d11602195e8420f5435;hpb=22365b2c55799a4ed18b5e373cd240c2be55b302;p=ngircd-alex.git

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 66b07569..50cce094 100644
--- 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.26 2002/06/01 15:55:17 alex Exp $
+ * $Id: channel.c,v 1.32 2002/09/03 23:57:57 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"
 
@@ -51,7 +52,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 ));
@@ -63,18 +63,24 @@ 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? */
-		if( ! Conf_Channel[i].name ) continue;
+		if( ! Conf_Channel[i].name[0] ) continue;
 
 		/* Gueltiger Channel-Name? */
 		if( ! Channel_IsValidName( Conf_Channel[i].name ))
@@ -84,12 +90,9 @@ Channel_Init( VOID )
 		}
 		
 		/* 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;
@@ -98,7 +101,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
@@ -152,12 +155,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 */
@@ -570,6 +569,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 )
 {
@@ -597,9 +608,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 */
 
@@ -610,7 +620,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;
@@ -620,10 +630,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 *
@@ -656,7 +670,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;
@@ -781,6 +795,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;