X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=3e1e710bad885417c6c22a0bf59f682150ef788f;hb=07c3e62e1109b555e932a8e2a245ed34668a1724;hp=4e5f561390f5470b83d03d46e13c73a513d837d5;hpb=71c7a6fcc07f1899197d494aefc0b9f4e91405e7;p=ngircd-alex.git diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 4e5f5613..3e1e710b 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -9,63 +9,29 @@ * 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.20 2002/03/25 16:54:26 alex Exp $ * * channel.c: Management der Channels - * - * $Log: channel.c,v $ - * 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 :-) */ #define __channel_c__ -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include #include #include #include "client.h" -#include "irc.h" +#include "hash.h" +#include "irc-write.h" #include "log.h" #include "messages.h" -#include +#include "exp.h" #include "channel.h" @@ -122,7 +88,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 +178,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; @@ -230,12 +203,19 @@ 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; @@ -246,7 +226,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 +237,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,10 +266,205 @@ 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 */ + + +GLOBAL BOOLEAN Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ) +{ + BOOLEAN is_member, has_voice, is_op, ok; + + /* Okay, Ziel ist ein 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; + } + + /* pruefen, ob Client in Channel schreiben darf */ + ok = TRUE; + if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = FALSE; + if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE; + + if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan )); + + /* Text senden */ + 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 */ + + + LOCAL CHANNEL *New_Chan( CHAR *Name ) { /* Neue Channel-Struktur anlegen */ - + CHANNEL *c; assert( Name != NULL ); @@ -286,9 +476,11 @@ 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, "" ); + c->hash = Hash( c->name ); Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name ); @@ -320,6 +512,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 +521,7 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) } cl2chan->channel = Chan; cl2chan->client = Client; + strcpy( cl2chan->modes, "" ); /* Verketten */ cl2chan->next = My_Cl2Chan;