X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=561d9aa0958a7c658c4f02cece2f9c138ba09451;hb=d58e22a3eab0741d6a471229c3c451ec1ae395bf;hp=d1b01daf6bba87e35a6fab8c36ba55b748db1d59;hpb=bb19cfda95cbbc0211d1e9d52a02218bbb434374;p=ngircd-alex.git diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index d1b01daf..561d9aa0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -9,11 +9,45 @@ * 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.5 2002/01/21 00:12:29 alex Exp $ + * $Id: channel.c,v 1.15 2002/02/27 20:32:10 alex Exp $ * * channel.c: Management der Channels * * $Log: channel.c,v $ + * 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(). + * + * 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 :-) * @@ -33,6 +67,9 @@ */ +#define __channel_c__ + + #include #include "global.h" @@ -50,32 +87,14 @@ #include "channel.h" -typedef struct _CHANNEL -{ - struct _CHANNEL *next; - CHAR name[CHANNEL_NAME_LEN]; /* Name des Channel */ - CHAR modes[CHANNEL_MODE_LEN]; /* Channel-Modes */ -} CHANNEL; - - -typedef struct _CLIENT2CHAN -{ - struct _CLIENT2CHAN *next; - CLIENT *client; - CHANNEL *channel; - CHAR modes[CHANNEL_MODE_LEN]; /* User-Modes in dem Channel */ -} CL2CHAN; - - LOCAL CHANNEL *My_Channels; LOCAL CL2CHAN *My_Cl2Chan; -LOCAL CHANNEL *Get_Chan( CHAR *Name ); 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 ); +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 ); @@ -121,14 +140,14 @@ 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; } /* Channel suchen */ - chan = Get_Chan( Name ); + chan = Channel_Search( Name ); if( chan ) { /* Ist der Client bereits Mitglied? */ @@ -159,7 +178,7 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R assert( Name != NULL ); /* Channel suchen */ - chan = Get_Chan( Name ); + chan = Channel_Search( Name ); if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client ))) { IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); @@ -167,7 +186,7 @@ GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *R } /* User aus Channel entfernen */ - if( ! Remove_Client( chan, Client, Origin, Reason )) return FALSE; + if( ! Remove_Client( chan, Client, Origin, Reason, TRUE )) return FALSE; else return TRUE; } /* Channel_Part */ @@ -182,7 +201,7 @@ GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason ) while( c ) { next_c = c->next; - Remove_Client( c, Client, Client_ThisServer( ), Reason ); + Remove_Client( c, Client, Client_ThisServer( ), Reason, FALSE ); c = next_c; } } /* Channel_RemoveClient */ @@ -204,7 +223,34 @@ GLOBAL INT Channel_Count( VOID ) } /* Channel_Count */ -LOCAL CHANNEL *Get_Chan( CHAR *Name ) +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 */ @@ -218,7 +264,209 @@ LOCAL CHANNEL *Get_Chan( CHAR *Name ) c = c->next; } return NULL; -} /* Get_Chan */ +} /* Channel_Search */ + + +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 ) +{ + assert( Chan != NULL ); + assert( Cl2Chan != NULL ); + return Get_Next_Cl2Chan( Cl2Chan->next, NULL, Chan ); +} /* 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 ); + return Cl2Chan->client; +} /* Channel_GetClient */ + + +GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan ) +{ + assert( Cl2Chan != NULL ); + return Cl2Chan->channel; +} /* Channel_GetChannel */ + + +GLOBAL BOOLEAN Channel_IsValidName( CHAR *Name ) +{ + /* PrŸfen, ob Name als Channelname gueltig */ + + assert( Name != NULL ); + + if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE; + 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 ); + Chan->topic[CHANNEL_TOPIC_LEN - 1] = '\0'; +} /* Channel_SetTopic */ LOCAL CHANNEL *New_Chan( CHAR *Name ) @@ -239,6 +487,7 @@ LOCAL CHANNEL *New_Chan( CHAR *Name ) strncpy( c->name, Name, CHANNEL_NAME_LEN ); c->name[CHANNEL_NAME_LEN - 1] = '\0'; strcpy( c->modes, "" ); + strcpy( c->topic, "" ); Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name ); @@ -270,6 +519,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 ) { @@ -278,16 +528,19 @@ LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client ) } cl2chan->channel = Chan; cl2chan->client = Client; + strcpy( cl2chan->modes, "" ); /* Verketten */ cl2chan->next = My_Cl2Chan; My_Cl2Chan = cl2chan; - + + Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name ); + return cl2chan; } /* Add_Client */ -LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason ) +LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason, BOOLEAN ServerPART ) { CL2CHAN *cl2chan, *last_cl2chan; CHANNEL *c; @@ -315,8 +568,9 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR else My_Cl2Chan = cl2chan->next; free( cl2chan ); - IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason ); - IRC_WriteStrRelatedChannelPrefix( Origin, c->name, 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 );