X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=c923404bff904382db95359a444ec6501129ec85;hp=5e3b9a802dc1d4ad28a8d7e6753ea792066675ca;hb=0428a1c4eab6945b6e536287bfcb2372334dba34;hpb=d8950c5dd092c092688c75cf0ec42cd950c7f7c4 diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 5e3b9a80..c923404b 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -17,7 +17,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: channel.c,v 1.58 2006/10/02 21:55:49 fw Exp $"; +static char UNUSED id[] = "$Id: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $"; #include "imp.h" #include @@ -56,7 +56,7 @@ static CL2CHAN *My_Cl2Chan; 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 bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const 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 )); @@ -70,6 +70,22 @@ Channel_Init( void ) } /* Channel_Init */ +GLOBAL struct list_head * +Channel_GetListBans(CHANNEL *c) +{ + assert(c != NULL); + return &c->list_bans; +} + + +GLOBAL struct list_head * +Channel_GetListInvites(CHANNEL *c) +{ + assert(c != NULL); + return &c->list_invites; +} + + GLOBAL void Channel_InitPredefined( void ) { @@ -115,6 +131,9 @@ Channel_InitPredefined( void ) while (*c) Channel_ModeAdd(chan, *c++); + Channel_SetKey(chan, Conf_Channel[i].key); + Channel_SetMaxUsers(chan, Conf_Channel[i].maxusers); + Log(LOG_INFO, "Created pre-defined channel \"%s\".", Conf_Channel[i].name ); } @@ -129,7 +148,7 @@ Channel_Exit( void ) { CHANNEL *c, *c_next; CL2CHAN *cl2chan, *cl2chan_next; - + /* Channel-Strukturen freigeben */ c = My_Channels; while( c ) @@ -182,30 +201,43 @@ Channel_Join( CLIENT *Client, char *Name ) } /* Channel_Join */ +/** + * Remove client from channel. + * This function lets a client lead a channel. First, the function checks + * if the channel exists and the client is a member of it and sends out + * appropriate error messages if not. The real work is done by the function + * Remove_Client(). + */ GLOBAL bool -Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) +Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Reason) { CHANNEL *chan; - assert( Client != NULL ); - assert( Name != NULL ); - assert( Reason != NULL ); + assert(Client != NULL); + assert(Name != NULL); + assert(Reason != NULL); - chan = Channel_Search( Name ); - if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client ))) - { - IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); + chan = Channel_Search(Name); + if (!chan) { + IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), Name); + return false; + } + if (!Get_Cl2Chan(chan, Client)) { + IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG, + Client_ID(Client), Name); return false; } - /* User aus Channel entfernen */ - if( ! Remove_Client( REMOVE_PART, 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_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) +Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason ) { CHANNEL *chan; @@ -265,11 +297,11 @@ Channel_Quit( CLIENT *Client, char *Reason ) } /* Channel_Quit */ -GLOBAL long +GLOBAL unsigned long Channel_Count( void ) { CHANNEL *c; - long count = 0; + unsigned long count = 0; c = My_Channels; while( c ) @@ -281,11 +313,11 @@ Channel_Count( void ) } /* Channel_Count */ -GLOBAL long +GLOBAL unsigned long Channel_MemberCount( CHANNEL *Chan ) { CL2CHAN *cl2chan; - long count = 0; + unsigned long count = 0; assert( Chan != NULL ); @@ -320,27 +352,9 @@ Channel_CountForUser( CLIENT *Client ) } /* 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 ) +GLOBAL const char * +Channel_Name( const CHANNEL *Chan ) { assert( Chan != NULL ); return Chan->name; @@ -363,7 +377,7 @@ Channel_Key( CHANNEL *Chan ) } /* Channel_Key */ -GLOBAL long +GLOBAL unsigned long Channel_MaxUsers( CHANNEL *Chan ) { assert( Chan != NULL ); @@ -387,7 +401,7 @@ Channel_Next( CHANNEL *Chan ) GLOBAL CHANNEL * -Channel_Search( char *Name ) +Channel_Search( const char *Name ) { /* Channel-Struktur suchen */ @@ -466,7 +480,10 @@ Channel_IsValidName( const char *Name ) { assert( Name != NULL ); - if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false; + if (strchr("+#", Name[0]) == NULL) + return false; + if (strlen(Name) >= CHANNEL_NAME_LEN) + return false; return Name[strcspn(Name, " ,:\007")] == 0; } /* Channel_IsValidName */ @@ -601,9 +618,7 @@ Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client ) assert( Chan != NULL ); assert( Client != NULL ); - - if( Get_Cl2Chan( Chan, Client )) return true; - else return false; + return Get_Cl2Chan(Chan, Client) != NULL; } /* Channel_IsMemberOf */ @@ -687,7 +702,7 @@ Channel_SetKey( CHANNEL *Chan, char *Key ) GLOBAL void -Channel_SetMaxUsers( CHANNEL *Chan, long Count ) +Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count) { assert( Chan != NULL ); @@ -696,38 +711,66 @@ Channel_SetMaxUsers( CHANNEL *Chan, long Count ) } /* Channel_SetMaxUsers */ -GLOBAL bool -Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text ) +static bool +Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) { - bool is_member, has_voice, is_op, ok; + bool is_member, has_voice, is_op; - /* Okay, target is a channel */ is_member = has_voice = is_op = false; - if( Channel_IsMemberOf( Chan, From )) - { + + 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; + 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, but is he channel operator or has voice? */ - if(( ! has_voice ) && ( ! is_op )) ok = false; - } + /* + * Is the client allowed to write to channel? + * + * If channel mode n set: non-members cannot send to channel. + * If channel mode m set: need voice. + */ + if (strchr(Channel_Modes(Chan), 'n') && !is_member) + return false; + + if (is_op || has_voice) + return true; - if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan )); + if (strchr(Channel_Modes(Chan), 'm')) + return false; - /* 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 */ + return !Lists_Check(&Chan->list_bans, From); +} + + +GLOBAL bool +Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text) +{ + if (!Can_Send_To_Channel(Chan, From)) + return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan)); + + if (Client_Conn(From) > NONE) + Conn_UpdateIdle(Client_Conn(From)); + + return IRC_WriteStrChannelPrefix(Client, Chan, From, true, + "PRIVMSG %s :%s", Channel_Name(Chan), Text); +} + + +GLOBAL bool +Channel_Notice(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text) +{ + if (!Can_Send_To_Channel(Chan, From)) + return true; /* no error, see RFC 2812 */ + + if (Client_Conn(From) > NONE) + Conn_UpdateIdle(Client_Conn(From)); + + return IRC_WriteStrChannelPrefix(Client, Chan, From, true, + "NOTICE %s :%s", Channel_Name(Chan), Text); +} GLOBAL CHANNEL * @@ -802,7 +845,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client ) static bool -Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ) +Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ) { CL2CHAN *cl2chan, *last_cl2chan; CHANNEL *c; @@ -852,7 +895,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re IRC_WriteStrClientPrefix(Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason); } - LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", + LogDebug("User \"%s\" has been kicked off \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID(Origin), Reason); break; default: /* PART */ @@ -876,11 +919,73 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re { if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan ); } - + return true; } /* Remove_Client */ +GLOBAL bool +Channel_AddBan(CHANNEL *c, const char *mask ) +{ + struct list_head *h = Channel_GetListBans(c); + return Lists_Add(h, mask, false); +} + + +GLOBAL bool +Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) +{ + struct list_head *h = Channel_GetListInvites(c); + return Lists_Add(h, mask, onlyonce); +} + + +static bool +ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite) +{ + struct list_elem *e; + char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG; + char *msg_end; + + assert( Client != NULL ); + assert( Channel != NULL ); + + e = Lists_GetFirst(head); + while (e) { + if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ), + Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED; + e = Lists_GetNext(e); + } + + msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG; + return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel )); +} + + +GLOBAL bool +Channel_ShowBans( CLIENT *Client, CHANNEL *Channel ) +{ + struct list_head *h; + + assert( Channel != NULL ); + + h = Channel_GetListBans(Channel); + return ShowInvitesBans(h, Client, Channel, false); +} + + +GLOBAL bool +Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel ) +{ + struct list_head *h; + + assert( Channel != NULL ); + + h = Channel_GetListInvites(Channel); + return ShowInvitesBans(h, Client, Channel, true); +} + + static CL2CHAN * Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan ) { @@ -910,7 +1015,7 @@ static bool Delete_Channel( CHANNEL *Chan ) { /* Channel-Struktur loeschen */ - + CHANNEL *chan, *last_chan; last_chan = NULL; @@ -926,13 +1031,14 @@ Delete_Channel( CHANNEL *Chan ) Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name ); /* Invite- und Ban-Lists aufraeumen */ - Lists_DeleteChannel( chan ); + Lists_Free( &chan->list_bans ); + Lists_Free( &chan->list_invites ); /* Neu verketten und freigeben */ if( last_chan ) last_chan->next = chan->next; else My_Channels = chan->next; free( chan ); - + return true; } /* Delete_Channel */