X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=139e9b184e00b25246121de5d864c4a474e4c6d5;hp=25c56ce5703f1699e0d5c8fa855ba070a2b1f9e3;hb=b422b11865a6243c070983e3a80ea226904f0edc;hpb=b5ee4552c167e5e887c5d9960123c34bbdba7c4f diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 25c56ce5..139e9b18 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -9,57 +9,28 @@ * 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.8 2002/01/27 21:56:54 alex Exp $ + * $Id: channel.c,v 1.19 2002/03/12 14:37:52 alex Exp $ * * channel.c: Management der Channels - * - * $Log: channel.c,v $ - * 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 :-) */ #define __channel_c__ -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include #include #include #include "client.h" -#include "irc.h" +#include "irc-write.h" #include "log.h" #include "messages.h" -#include +#include "exp.h" #include "channel.h" @@ -116,7 +87,7 @@ GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name ) assert( Name != NULL ); /* Valider Channel-Name? */ - if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) + if( ! Channel_IsValidName( Name )) { IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); return FALSE; @@ -199,6 +170,33 @@ GLOBAL INT Channel_Count( VOID ) } /* Channel_Count */ +GLOBAL CHAR *Channel_Name( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->name; +} /* Channel_Name */ + + +GLOBAL CHAR *Channel_Modes( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->modes; +} /* Channel_Modes */ + + +GLOBAL CHANNEL *Channel_First( VOID ) +{ + return My_Channels; +} /* Channel_First */ + + +GLOBAL CHANNEL *Channel_Next( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->next; +} /* Channel_Next */ + + GLOBAL CHANNEL *Channel_Search( CHAR *Name ) { /* Channel-Struktur suchen */ @@ -220,7 +218,7 @@ GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan ) { assert( Chan != NULL ); return Get_First_Cl2Chan( NULL, Chan ); -} /* Channel_IsMember */ +} /* Channel_FirstMember */ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan ) @@ -231,6 +229,21 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan ) } /* Channel_NextMember */ +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 ) +{ + assert( Client != NULL ); + assert( Cl2Chan != NULL ); + return Get_Next_Cl2Chan( Cl2Chan->next, Client, NULL ); +} /* Channel_NextChannelOf */ + + GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan ) { assert( Cl2Chan != NULL ); @@ -245,6 +258,174 @@ GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan ) } /* Channel_GetChannel */ +GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name ) +{ + /* PrŸfen, ob Name als Channelname gueltig */ + + CHAR *ptr, badchars[] = " ,:\x07"; + + assert( Name != NULL ); + + if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE; + + ptr = Name; + while( *ptr ) + { + if( strchr( badchars, *ptr )) return FALSE; + ptr++; + } + + return TRUE; +} /* Channel_IsValidName */ + + +GLOBAL BOOLEAN 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. */ + + 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; + } + else return FALSE; +} /* Channel_ModeAdd */ + + +GLOBAL BOOLEAN 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; + + assert( Chan != NULL ); + + x[0] = Mode; x[1] = '\0'; + + p = strchr( Chan->modes, x[0] ); + if( ! p ) return FALSE; + + /* Client hat den Mode -> loeschen */ + while( *p ) + { + *p = *(p + 1); + p++; + } + return TRUE; +} /* Channel_ModeDel */ + + +GLOBAL BOOLEAN 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. */ + + CL2CHAN *cl2chan; + CHAR x[2]; + + assert( Chan != NULL ); + assert( Client != NULL ); + + cl2chan = Get_Cl2Chan( Chan, Client ); + assert( cl2chan != NULL ); + + 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; + } + else return FALSE; +} /* Channel_UserModeAdd */ + + +GLOBAL BOOLEAN 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. */ + + CL2CHAN *cl2chan; + CHAR x[2], *p; + + assert( Chan != NULL ); + assert( Client != NULL ); + + cl2chan = Get_Cl2Chan( Chan, Client ); + assert( cl2chan != NULL ); + + x[0] = Mode; x[1] = '\0'; + + p = strchr( cl2chan->modes, x[0] ); + if( ! p ) return FALSE; + + /* Client hat den Mode -> loeschen */ + while( *p ) + { + *p = *(p + 1); + p++; + } + return TRUE; +} /* Channel_UserModeDel */ + + +GLOBAL CHAR *Channel_UserModes( CHANNEL *Chan, CLIENT *Client ) +{ + /* Channel-Modes eines Users liefern */ + + CL2CHAN *cl2chan; + + assert( Chan != NULL ); + assert( Client != NULL ); + + cl2chan = Get_Cl2Chan( Chan, Client ); + assert( cl2chan != NULL ); + + return cl2chan->modes; +} /* Channel_UserModes */ + + +GLOBAL BOOLEAN Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client ) +{ + /* Pruefen, ob Client Mitglied in Channel ist */ + + assert( Chan != NULL ); + assert( Client != NULL ); + + if( Get_Cl2Chan( Chan, Client )) return TRUE; + else return FALSE; +} /* Channel_IsMemberOf */ + + +GLOBAL CHAR *Channel_Topic( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->topic; +} /* Channel_Topic */ + + +GLOBAL VOID Channel_SetTopic( CHANNEL *Chan, CHAR *Topic ) +{ + assert( Chan != NULL ); + assert( Topic != NULL ); + + strncpy( Chan->topic, Topic, CHANNEL_TOPIC_LEN - 1 ); + Chan->topic[CHANNEL_TOPIC_LEN - 1] = '\0'; +} /* Channel_SetTopic */ + + LOCAL CHANNEL *New_Chan( CHAR *Name ) { /* Neue Channel-Struktur anlegen */ @@ -260,9 +441,10 @@ LOCAL CHANNEL *New_Chan( CHAR *Name ) return NULL; } c->next = NULL; - strncpy( c->name, Name, CHANNEL_NAME_LEN ); + strncpy( c->name, Name, CHANNEL_NAME_LEN - 1 ); c->name[CHANNEL_NAME_LEN - 1] = '\0'; strcpy( c->modes, "" ); + strcpy( c->topic, "" ); Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name ); @@ -294,6 +476,7 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) assert( Chan != NULL ); assert( Client != NULL ); + /* neue CL2CHAN-Struktur anlegen */ cl2chan = malloc( sizeof( CL2CHAN )); if( ! cl2chan ) { @@ -302,6 +485,7 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) } cl2chan->channel = Chan; cl2chan->client = Client; + strcpy( cl2chan->modes, "" ); /* Verketten */ cl2chan->next = My_Cl2Chan; @@ -341,9 +525,9 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR else My_Cl2Chan = cl2chan->next; free( cl2chan ); - if( Client_Conn( Origin ) > NONE ) IRC_WriteStrClientPrefix( Origin, 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 );