X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=ac5eb5c4616370015d9f7c4ed679ddd67c7f64c8;hp=0ed2e3fe7bfe9bef248a71fc04149f8b0e2e6e4f;hb=ca32c1b311379445d1c8bee5705a9371cf2fa1a7;hpb=d72c55a09dd8e87ccdcb1b97ae2306c1957baca9 diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 0ed2e3fe..ac5eb5c4 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1,107 +1,130 @@ /* * 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) * - * 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.13 2002/02/11 01:00:12 alex Exp $ - * - * channel.c: Management der Channels - * - * $Log: channel.c,v $ - * Revision 1.13 2002/02/11 01:00:12 alex - * - neue Funktionen Channel_ModeAdd(), Channel_ModeDel(), Channel_UserModes(), - * Channel_UserModeAdd(), Channel_UserModeDel(). - * - Modes in CL2CHAN-Struktur werden nun korrekt initialisiert. - * - * Revision 1.12 2002/02/06 16:48:48 alex - * - neue Funktion Channel_Modes() und Channel_IsValidName(). - * - Channel-Namen werden (besser) validiert. - * - * 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(), ...) - * - * Revision 1.5 2002/01/21 00:12:29 alex - * - begonnen, Channels zu implementieren :-) - * - * Revision 1.4 2002/01/16 22:09:07 alex - * - neue Funktion Channel_Count(). - * - * Revision 1.3 2002/01/02 02:42:58 alex - * - Copyright-Texte aktualisiert. - * - * Revision 1.2 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.1 2001/12/14 08:13:43 alex - * - neues Modul begonnen :-) + * Channel management */ #define __channel_c__ -#include -#include "global.h" +#include "portab.h" -#include +static char UNUSED id[] = "$Id: channel.c,v 1.54 2005/09/02 12:50:25 alex Exp $"; + +#include "imp.h" #include #include #include +#include +#include +#include "defines.h" +#include "conn-func.h" #include "client.h" -#include "irc.h" + +#include "exp.h" +#include "channel.h" + +#include "imp.h" +#include "irc-write.h" +#include "resolve.h" +#include "conf.h" +#include "hash.h" +#include "lists.h" #include "log.h" #include "messages.h" -#include -#include "channel.h" +#include "exp.h" + +#define REMOVE_PART 0 +#define REMOVE_QUIT 1 +#define REMOVE_KICK 2 -LOCAL CHANNEL *My_Channels; -LOCAL CL2CHAN *My_Cl2Chan; +static CHANNEL *My_Channels; +static 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, 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 ); +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 Channel_Init( VOID ) + +GLOBAL void +Channel_Init( void ) { My_Channels = NULL; My_Cl2Chan = NULL; } /* Channel_Init */ -GLOBAL VOID Channel_Exit( VOID ) +GLOBAL void +Channel_InitPredefined( void ) +{ + /* Vordefinierte persistente Channels erzeugen */ + + CHANNEL *chan; + char *c; + unsigned int i; + + for( i = 0; i < Conf_Channel_Count; i++ ) + { + /* Ist ein Name konfiguriert? */ + if( ! Conf_Channel[i].name[0] ) continue; + + /* Gueltiger Channel-Name? */ + 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; + } + + /* 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 ); + array_free(&Conf_Channel[i].topic); + continue; + } + + /* 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 ); + } + else Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!", + Conf_Channel[i].name ); + } +} /* Channel_InitPredefined */ + + +GLOBAL void +Channel_Exit( void ) { CHANNEL *c, *c_next; CL2CHAN *cl2chan, *cl2chan_next; @@ -111,6 +134,7 @@ GLOBAL VOID Channel_Exit( VOID ) while( c ) { c_next = c->next; + array_free(&c->topic); free( c ); c = c_next; } @@ -126,7 +150,8 @@ GLOBAL VOID Channel_Exit( VOID ) } /* Channel_Exit */ -GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name ) +GLOBAL bool +Channel_Join( CLIENT *Client, char *Name ) { CHANNEL *chan; @@ -137,7 +162,7 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name ) if( ! Channel_IsValidName( Name )) { IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); - return FALSE; + return false; } /* Channel suchen */ @@ -145,68 +170,113 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name ) if( chan ) { /* Ist der Client bereits Mitglied? */ - if( Get_Cl2Chan( chan, Client )) return FALSE; + if( Get_Cl2Chan( chan, Client )) return false; } else { /* Gibt es noch nicht? Dann neu anlegen: */ - chan = New_Chan( Name ); - if( ! chan ) return FALSE; - - /* Verketten */ - chan->next = My_Channels; - My_Channels = chan; + chan = Channel_Create( Name ); + if( ! chan ) return false; } /* User dem Channel hinzufuegen */ - if( ! Add_Client( chan, Client )) return FALSE; - else return TRUE; + if( ! Add_Client( chan, Client )) return false; + else return true; } /* Channel_Join */ -GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ) +GLOBAL bool +Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) { CHANNEL *chan; assert( Client != NULL ); assert( Name != NULL ); + assert( Reason != NULL ); /* Channel suchen */ chan = Channel_Search( Name ); if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client ))) { IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); - return FALSE; + return false; } /* User aus Channel entfernen */ - if( ! Remove_Client( chan, Client, Origin, Reason, TRUE )) return FALSE; - else return TRUE; + if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, true)) return false; + else return true; } /* Channel_Part */ -GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason ) +GLOBAL void +Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) +{ + CHANNEL *chan; + + assert( Client != NULL ); + assert( Origin != NULL ); + assert( Name != NULL ); + assert( Reason != NULL ); + + /* Channel suchen */ + chan = Channel_Search( Name ); + if( ! chan ) + { + IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name ); + return; + } + + /* Ist der User Mitglied in dem Channel? */ + if( ! Channel_IsMemberOf( chan, Origin )) + { + IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name ); + return; + } + + /* Ist der User Channel-Operator? */ + if( ! strchr( Channel_UserModes( chan, Origin ), 'o' )) + { + IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name); + return; + } + + /* Ist der Ziel-User Mitglied im Channel? */ + if( ! Channel_IsMemberOf( chan, Client )) + { + IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name ); + return; + } + + Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true); +} /* Channel_Kick */ + + +GLOBAL void +Channel_Quit( CLIENT *Client, char *Reason ) { CHANNEL *c, *next_c; assert( Client != NULL ); + assert( Reason != NULL ); + + IRC_WriteStrRelatedPrefix( Client, Client, false, "QUIT :%s", Reason ); c = My_Channels; while( c ) { next_c = c->next; - Remove_Client( c, Client, Client_ThisServer( ), Reason, FALSE ); + Remove_Client( REMOVE_QUIT, c, Client, Client, Reason, false ); c = next_c; } -} /* Channel_RemoveClient */ +} /* Channel_Quit */ -GLOBAL INT Channel_Count( VOID ) +GLOBAL long +Channel_Count( void ) { CHANNEL *c; - INT count; + long count = 0; - count = 0; c = My_Channels; while( c ) { @@ -217,58 +287,146 @@ GLOBAL INT Channel_Count( VOID ) } /* Channel_Count */ -GLOBAL CHAR *Channel_Name( CHANNEL *Chan ) +GLOBAL long +Channel_MemberCount( CHANNEL *Chan ) +{ + CL2CHAN *cl2chan; + long count = 0; + + assert( Chan != NULL ); + + cl2chan = My_Cl2Chan; + while( cl2chan ) + { + if( cl2chan->channel == Chan ) count++; + cl2chan = cl2chan->next; + } + return count; +} /* Channel_MemberCount */ + + +GLOBAL int +Channel_CountForUser( CLIENT *Client ) +{ + /* Count number of channels a user is member of. */ + + CL2CHAN *cl2chan; + int count = 0; + + assert( Client != NULL ); + + 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 = 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 ) { assert( Chan != NULL ); return Chan->name; } /* Channel_Name */ -GLOBAL CHAR *Channel_Modes( CHANNEL *Chan ) +GLOBAL char * +Channel_Modes( CHANNEL *Chan ) { assert( Chan != NULL ); return Chan->modes; } /* Channel_Modes */ -GLOBAL CHANNEL *Channel_First( VOID ) +GLOBAL char * +Channel_Key( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->key; +} /* Channel_Key */ + + +GLOBAL long +Channel_MaxUsers( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->maxusers; +} /* Channel_MaxUsers */ + + +GLOBAL CHANNEL * +Channel_First( void ) { return My_Channels; } /* Channel_First */ -GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan ) +GLOBAL CHANNEL * +Channel_Next( CHANNEL *Chan ) { assert( Chan != NULL ); return Chan->next; } /* Channel_Next */ -GLOBAL CHANNEL *Channel_Search( CHAR *Name ) +GLOBAL CHANNEL * +Channel_Search( char *Name ) { /* Channel-Struktur suchen */ CHANNEL *c; + UINT32 search_hash; assert( Name != NULL ); + + search_hash = Hash( Name ); c = My_Channels; while( c ) { - if( strcasecmp( Name, c->name ) == 0 ) return c; + if( search_hash == c->hash ) + { + /* lt. Hash-Wert: Treffer! */ + if( strcasecmp( Name, c->name ) == 0 ) return c; + } c = c->next; } return NULL; } /* Channel_Search */ -GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan ) +GLOBAL CL2CHAN * +Channel_FirstMember( CHANNEL *Chan ) { assert( Chan != NULL ); return Get_First_Cl2Chan( NULL, Chan ); } /* Channel_FirstMember */ -GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan ) +GLOBAL CL2CHAN * +Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan ) { assert( Chan != NULL ); assert( Cl2Chan != NULL ); @@ -276,14 +434,16 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan ) } /* Channel_NextMember */ -GLOBAL CL2CHAN *Channel_FirstChannelOf( CLIENT *Client ) +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 ) +GLOBAL CL2CHAN * +Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan ) { assert( Client != NULL ); assert( Cl2Chan != NULL ); @@ -291,85 +451,104 @@ GLOBAL CL2CHAN *Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan ) } /* Channel_NextChannelOf */ -GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan ) +GLOBAL CLIENT * +Channel_GetClient( CL2CHAN *Cl2Chan ) { assert( Cl2Chan != NULL ); return Cl2Chan->client; } /* Channel_GetClient */ -GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan ) +GLOBAL CHANNEL * +Channel_GetChannel( CL2CHAN *Cl2Chan ) { assert( Cl2Chan != NULL ); return Cl2Chan->channel; } /* Channel_GetChannel */ -GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name ) +GLOBAL bool +Channel_IsValidName( char *Name ) { - /* PrŸfen, ob Name als Channelname gueltig */ + /* Pruefen, ob Name als Channelname gueltig */ + + char *ptr, badchars[10]; assert( Name != NULL ); - if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE; - return TRUE; + if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false; + + ptr = Name; + strcpy( badchars, " ,:\007" ); + while( *ptr ) + { + if( strchr( badchars, *ptr )) return false; + ptr++; + } + + return true; } /* Channel_IsValidName */ -GLOBAL BOOLEAN Channel_ModeAdd( CHANNEL *Chan, CHAR Mode ) +GLOBAL bool +Channel_ModeAdd( CHANNEL *Chan, char Mode ) { - /* Mode soll gesetzt werden. TRUE wird geliefert, wenn der - * Mode neu gesetzt wurde, FALSE, wenn der Channel den Mode - * bereits hatte. */ + /* set Mode. + * If the channel already had this mode, return false. + * If the channel mode was newly set return true. + */ - CHAR x[2]; + char x[2]; assert( Chan != NULL ); x[0] = Mode; x[1] = '\0'; if( ! strchr( Chan->modes, x[0] )) { - /* Client hat den Mode noch nicht -> setzen */ - strcat( Chan->modes, x ); - return TRUE; + /* Channel does not have this mode yet, set it */ + strlcat( Chan->modes, x, sizeof( Chan->modes )); + return true; } - else return FALSE; + else return false; } /* Channel_ModeAdd */ -GLOBAL BOOLEAN Channel_ModeDel( CHANNEL *Chan, CHAR Mode ) +GLOBAL bool +Channel_ModeDel( CHANNEL *Chan, char Mode ) { - /* Mode soll geloescht werden. TRUE wird geliefert, wenn der - * Mode entfernt wurde, FALSE, wenn der Channel den Mode - * ueberhaupt nicht hatte. */ - - CHAR x[2], *p; + /* Delete mode. + * if the mode was removed return true. + * if the channel did not have the mode, return false. + */ + char x[2], *p; assert( Chan != NULL ); x[0] = Mode; x[1] = '\0'; p = strchr( Chan->modes, x[0] ); - if( ! p ) return FALSE; + if( ! p ) return false; - /* Client hat den Mode -> loeschen */ + /* Channel has mode -> delete */ while( *p ) { *p = *(p + 1); p++; } - return TRUE; + return true; } /* Channel_ModeDel */ -GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode ) +GLOBAL bool +Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, char Mode ) { - /* Channel-User-Mode soll gesetzt werden. TRUE wird geliefert, - * wenn der Mode neu gesetzt wurde, FALSE, wenn der User den - * Channel-Mode bereits hatte. */ + /* Set Channel-User-Mode. + * if mode was newly set, return true. + * if the User already had this channel-mode, return false. + */ CL2CHAN *cl2chan; - CHAR x[2]; + char x[2]; assert( Chan != NULL ); assert( Client != NULL ); @@ -380,22 +559,24 @@ GLOBAL BOOLEAN Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, CHAR Mode ) x[0] = Mode; x[1] = '\0'; if( ! strchr( cl2chan->modes, x[0] )) { - /* Client hat den Mode noch nicht -> setzen */ - strcat( cl2chan->modes, x ); - return TRUE; + /* mode not set, -> set it */ + strlcat( cl2chan->modes, x, sizeof( cl2chan->modes )); + return true; } - else return FALSE; + else return false; } /* Channel_UserModeAdd */ -GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode ) +GLOBAL bool +Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, char Mode ) { - /* Channel-User-Mode soll geloescht werden. TRUE wird geliefert, - * wenn der Mode entfernt wurde, FALSE, wenn der User den Channel-Mode - * ueberhaupt nicht hatte. */ + /* Delete Channel-User-Mode. + * If Mode was removed, return true. + * If User did not have the Channel-Mode, return false. + */ CL2CHAN *cl2chan; - CHAR x[2], *p; + char x[2], *p; assert( Chan != NULL ); assert( Client != NULL ); @@ -406,21 +587,22 @@ GLOBAL BOOLEAN Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, CHAR Mode ) x[0] = Mode; x[1] = '\0'; p = strchr( cl2chan->modes, x[0] ); - if( ! p ) return FALSE; + if( ! p ) return false; - /* Client hat den Mode -> loeschen */ + /* Client has Mode -> delete */ while( *p ) { *p = *(p + 1); p++; } - return TRUE; + return true; } /* Channel_UserModeDel */ -GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client ) +GLOBAL char * +Channel_UserModes( CHANNEL *Chan, CLIENT *Client ) { - /* Channel-Modes eines Users liefern */ + /* return Users' Channel-Modes */ CL2CHAN *cl2chan; @@ -434,32 +616,173 @@ GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client ) } /* Channel_UserModes */ -LOCAL CHANNEL *New_Chan( CHAR *Name ) +GLOBAL bool +Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client ) +{ + /* Test if Client is on Channel Chan */ + + assert( Chan != NULL ); + assert( Client != NULL ); + + if( Get_Cl2Chan( Chan, Client )) return true; + else return false; +} /* Channel_IsMemberOf */ + + +GLOBAL char * +Channel_Topic( CHANNEL *Chan ) +{ + char *ret; + assert( Chan != NULL ); + 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, CLIENT *Client, char *Topic) +{ + size_t len; + assert( Chan != NULL ); + assert( Topic != NULL ); + + 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 */ + + +GLOBAL void +Channel_SetModes( CHANNEL *Chan, char *Modes ) +{ + assert( Chan != NULL ); + assert( Modes != NULL ); + + strlcpy( Chan->modes, Modes, sizeof( Chan->modes )); +} /* Channel_SetModes */ + + +GLOBAL void +Channel_SetKey( CHANNEL *Chan, char *Key ) +{ + assert( Chan != NULL ); + assert( Key != NULL ); + + strlcpy( Chan->key, Key, sizeof( Chan->key )); + Log( LOG_DEBUG, "Channel %s: Key is now \"%s\".", Chan->name, Chan->key ); +} /* Channel_SetKey */ + + +GLOBAL void +Channel_SetMaxUsers( CHANNEL *Chan, long Count ) +{ + assert( Chan != NULL ); + + Chan->maxusers = Count; + Log( LOG_DEBUG, "Channel %s: Member limit is now %ld.", Chan->name, Chan->maxusers ); +} /* Channel_SetMaxUsers */ + + +GLOBAL bool +Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text ) { - /* Neue Channel-Struktur anlegen */ + bool is_member, has_voice, is_op, ok; + + /* Okay, target is a channel */ + is_member = has_voice = is_op = false; + if( Channel_IsMemberOf( Chan, From )) + { + is_member = true; + if( strchr( Channel_UserModes( Chan, From ), 'v' )) has_voice = true; + if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = true; + } + + /* Is the client allowed to write to channel? */ + ok = true; + if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = false; + if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = false; + /* Is the client banned? */ + if( Lists_CheckBanned( From, Chan )) + { + /* Client is banned, bus is he channel operator or has voice? */ + if(( ! has_voice ) && ( ! is_op )) ok = false; + } + + if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan )); + + /* Send text */ + if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From )); + return IRC_WriteStrChannelPrefix( Client, Chan, From, true, "PRIVMSG %s :%s", Channel_Name( Chan ), Text ); +} /* Channel_Write */ + + +GLOBAL CHANNEL * +Channel_Create( char *Name ) +{ + /* Create new CHANNEL structure and add it to linked list */ CHANNEL *c; assert( Name != NULL ); - c = malloc( sizeof( CHANNEL )); + c = (CHANNEL *)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; - strncpy( c->name, Name, CHANNEL_NAME_LEN ); - c->name[CHANNEL_NAME_LEN - 1] = '\0'; - strcpy( c->modes, "" ); - + memset( c, 0, sizeof( CHANNEL )); + strlcpy( c->name, Name, sizeof( c->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; -} /* New_Chan */ +} /* Channel_Create */ -LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client ) +static CL2CHAN * +Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client ) { CL2CHAN *cl2chan; @@ -476,7 +799,8 @@ LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client ) } /* Get_Cl2Chan */ -LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) +static CL2CHAN * +Add_Client( CHANNEL *Chan, CLIENT *Client ) { CL2CHAN *cl2chan; @@ -484,10 +808,10 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) assert( Client != NULL ); /* neue CL2CHAN-Struktur anlegen */ - cl2chan = malloc( sizeof( CL2CHAN )); + cl2chan = (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; @@ -504,7 +828,8 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) } /* Add_Client */ -LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART ) +static bool +Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ) { CL2CHAN *cl2chan, *last_cl2chan; CHANNEL *c; @@ -522,7 +847,7 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR last_cl2chan = cl2chan; cl2chan = cl2chan->next; } - if( ! cl2chan ) return FALSE; + if( ! cl2chan ) return false; c = cl2chan->channel; assert( c != NULL ); @@ -532,26 +857,49 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR else My_Cl2Chan = cl2chan->next; free( cl2chan ); - 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 ); + switch( Type ) + { + case REMOVE_QUIT: + /* QUIT: andere Server wurden bereits informiert, vgl. Client_Destroy(); + * hier also "nur" noch alle User in betroffenen Channeln infomieren */ + assert( InformServer == false ); + Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason ); + break; + case REMOVE_KICK: + /* User wurde geKICKed: ggf. andere Server sowie alle betroffenen User + * im entsprechenden Channel informieren */ + if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); + IRC_WriteStrChannelPrefix( Client, c, Origin, false, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); + if(( Client_Conn( Client ) > NONE ) && ( Client_Type( Client ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); + Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason ); + break; + default: + /* PART */ + if( InformServer ) 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 ); + } - /* Wenn Channel nun leer: loeschen */ - if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan ); + /* Wenn Channel nun leer und nicht pre-defined: loeschen */ + if( ! strchr( Channel_Modes( Chan ), 'P' )) + { + if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan ); + } - return TRUE; + return true; } /* Remove_Client */ -LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan ) +static CL2CHAN * +Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan ) { return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan ); } /* Get_First_Cl2Chan */ -LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel ) +static CL2CHAN * +Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel ) { CL2CHAN *cl2chan; @@ -568,7 +916,8 @@ LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channe } /* Get_Next_Cl2Chan */ -LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan ) +static bool +Delete_Channel( CHANNEL *Chan ) { /* Channel-Struktur loeschen */ @@ -582,16 +931,19 @@ LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan ) last_chan = chan; chan = chan->next; } - if( ! chan ) return FALSE; + if( ! chan ) return false; 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; free( chan ); - return TRUE; + return true; } /* Delete_Channel */