X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=982d8335ea739acf07744728976b9296abfd997d;hp=4e5f561390f5470b83d03d46e13c73a513d837d5;hb=10363b398e05604d2318c67b943e7a742cb25323;hpb=71c7a6fcc07f1899197d494aefc0b9f4e91405e7 diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 4e5f5613..982d8335 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -9,11 +9,38 @@ * 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.10 2002/01/28 01:16:15 alex Exp $ + * $Id: channel.c,v 1.18 2002/03/03 17:17:01 alex Exp $ * * channel.c: Management der Channels * * $Log: channel.c,v $ + * Revision 1.18 2002/03/03 17:17:01 alex + * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-) + * + * Revision 1.17 2002/03/02 01:35:50 alex + * - Channel- und Nicknames werden nun ordentlich validiert. + * + * Revision 1.16 2002/02/27 23:23:53 alex + * - Includes fuer einige Header bereinigt. + * + * Revision 1.15 2002/02/27 20:32:10 alex + * - neue Funktionen Channel_Topic() und Channel_SetTopic(). + * + * Revision 1.14 2002/02/27 15:21:21 alex + * - neue Funktion Channel_IsMemberOf() implementiert. + * + * 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(). * @@ -61,7 +88,7 @@ #include #include "client.h" -#include "irc.h" +#include "irc-write.h" #include "log.h" #include "messages.h" @@ -122,7 +149,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; @@ -212,6 +239,13 @@ GLOBAL CHAR *Channel_Name( CHANNEL *Chan ) } /* Channel_Name */ +GLOBAL CHAR *Channel_Modes( CHANNEL *Chan ) +{ + assert( Chan != NULL ); + return Chan->modes; +} /* Channel_Modes */ + + GLOBAL CHANNEL *Channel_First( VOID ) { return My_Channels; @@ -246,7 +280,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 ) @@ -257,6 +291,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 ); @@ -271,6 +320,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 */ @@ -286,9 +503,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 ); @@ -320,6 +538,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 ) { @@ -328,6 +547,7 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) } cl2chan->channel = Chan; cl2chan->client = Client; + strcpy( cl2chan->modes, "" ); /* Verketten */ cl2chan->next = My_Cl2Chan;