]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/channel.c
Implementec numeric "333": Time and user name who set a channel topic.
[ngircd-alex.git] / src / ngircd / channel.c
index 2642392c31886827f1072c1ad44c3f8b9619f485..ac5eb5c4616370015d9f7c4ed679ddd67c7f64c8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
  *
  * 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
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.46 2005/03/19 18:43:48 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.54 2005/09/02 12:50:25 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <strings.h>
 
+#include "defines.h"
 #include "conn-func.h"
 #include "client.h"
 
@@ -48,16 +50,16 @@ static char UNUSED id[] = "$Id: channel.c,v 1.46 2005/03/19 18:43:48 fw Exp $";
 #define REMOVE_KICK 2
 
 
-LOCAL CHANNEL *My_Channels;
-LOCAL CL2CHAN *My_Cl2Chan;
+static CHANNEL *My_Channels;
+static CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-LOCAL bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
-LOCAL CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
-LOCAL CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
-LOCAL bool Delete_Channel PARAMS(( CHANNEL *Chan ));
+static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
+static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
+static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
 
 
 GLOBAL void
@@ -75,7 +77,7 @@ Channel_InitPredefined( void )
 
        CHANNEL *chan;
        char *c;
-       int i;
+       unsigned int i;
        
        for( i = 0; i < Conf_Channel_Count; i++ )
        {
@@ -86,6 +88,7 @@ Channel_InitPredefined( void )
                if( ! Channel_IsValidName( Conf_Channel[i].name ))
                {
                        Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
+                       array_free(&Conf_Channel[i].topic);
                        continue;
                }
 
@@ -94,20 +97,28 @@ Channel_InitPredefined( void )
                if( chan )
                {
                        Log( LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", Conf_Channel[i].name );
+                       array_free(&Conf_Channel[i].topic);
                        continue;
                }
-               
-               /* Channel anlegen */
-               chan = Channel_Create( Conf_Channel[i].name );
-               if( chan )
-               {
-                       Channel_ModeAdd( chan, 'P' );
-                       Channel_SetTopic( chan, Conf_Channel[i].topic );
+
+               /* Create channel */
+               chan = Channel_Create(Conf_Channel[i].name);
+               if (chan) {
+                       Channel_ModeAdd(chan, 'P');
+
+                       Channel_SetTopic(chan, NULL,
+                                        array_start(&Conf_Channel[i].topic));
+                       array_free(&Conf_Channel[i].topic);
+
                        c = Conf_Channel[i].modes;
-                       while( *c ) Channel_ModeAdd( chan, *c++ );
-                       Log( LOG_INFO, "Created pre-defined channel \"%s\".", Conf_Channel[i].name );
+                       while (*c)
+                               Channel_ModeAdd(chan, *c++);
+               
+                       Log(LOG_INFO, "Created pre-defined channel \"%s\".",
+                                                       Conf_Channel[i].name );
                }
-               else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
+               else Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
+                                                       Conf_Channel[i].name );
        }
 } /* Channel_InitPredefined */
 
@@ -123,6 +134,7 @@ Channel_Exit( void )
        while( c )
        {
                c_next = c->next;
+               array_free(&c->topic);
                free( c );
                c = c_next;
        }
@@ -247,6 +259,8 @@ Channel_Quit( CLIENT *Client, char *Reason )
        assert( Client != NULL );
        assert( Reason != NULL );
 
+       IRC_WriteStrRelatedPrefix( Client, Client, false, "QUIT :%s", Reason );
+
        c = My_Channels;
        while( c )
        {
@@ -618,18 +632,61 @@ Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
 GLOBAL char *
 Channel_Topic( CHANNEL *Chan )
 {
+       char *ret;
        assert( Chan != NULL );
-       return Chan->topic;
+       ret = array_start(&Chan->topic);
+       return ret ? ret : "";
 } /* Channel_Topic */
 
+       
+#ifndef STRICT_RFC
+
+GLOBAL unsigned int
+Channel_TopicTime(CHANNEL *Chan)
+{
+       assert(Chan != NULL);
+       return (unsigned int) Chan->topic_time;
+} /* Channel_TopicTime */
+
+
+GLOBAL char *
+Channel_TopicWho(CHANNEL *Chan)
+{
+       assert(Chan != NULL);
+       return Chan->topic_who;
+} /* Channel_TopicWho */
+
+#endif
+
 
 GLOBAL void
-Channel_SetTopic( CHANNEL *Chan, char *Topic )
+Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic)
 {
+       size_t len;
        assert( Chan != NULL );
        assert( Topic != NULL );
-       
-       strlcpy( Chan->topic, Topic, sizeof( Chan->topic ));
+
+       len = strlen(Topic);
+       if (len < array_bytes(&Chan->topic))
+               array_free(&Chan->topic);
+
+       if (!array_copyb(&Chan->topic, Topic, len))
+               Log(LOG_WARNING, "could not set new Topic \"%s\" on %s: %s",
+                                       Topic, Chan->name, strerror(errno));
+
+       array_cat0(&Chan->topic);
+
+#ifndef STRICT_RFC
+       Chan->topic_time = time(NULL);
+       if (Client != NULL && Client_Type(Client) != CLIENT_SERVER)
+               strlcpy(Chan->topic_who, Client_ID(Client),
+                       sizeof Chan->topic_who);
+       else
+               strlcpy(Chan->topic_who, DEFAULT_TOPIC_ID,
+                       sizeof Chan->topic_who);
+#else
+       (void) Client;
+#endif
 } /* Channel_SetTopic */
 
 
@@ -717,14 +774,14 @@ Channel_Create( char *Name )
        c->hash = Hash( c->name );
        c->next = My_Channels;
        My_Channels = c;
-       
+#ifdef DEBUG   
        Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
-       
+#endif
        return c;
 } /* Channel_Create */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 {
        CL2CHAN *cl2chan;
@@ -742,7 +799,7 @@ Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 } /* Get_Cl2Chan */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Add_Client( CHANNEL *Chan, CLIENT *Client )
 {
        CL2CHAN *cl2chan;
@@ -771,7 +828,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 } /* Add_Client */
 
 
-LOCAL bool
+static bool
 Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
 {
        CL2CHAN *cl2chan, *last_cl2chan;
@@ -806,7 +863,6 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
                        /* 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:
@@ -835,14 +891,14 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
 } /* Remove_Client */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
        return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
 } /* Get_First_Cl2Chan */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 {
        CL2CHAN *cl2chan;
@@ -860,7 +916,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 } /* Get_Next_Cl2Chan */
 
 
-LOCAL bool
+static bool
 Delete_Channel( CHANNEL *Chan )
 {
        /* Channel-Struktur loeschen */