X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Firc-channel.c;h=dbf26fe2bec01fe806e42962bb5cdf53d47610f9;hb=ca32c1b311379445d1c8bee5705a9371cf2fa1a7;hp=79be000568b476f1f1c871488f5ffbdba9a443d9;hpb=233210b9063b0c2d49d59cb0f172e119b322e647;p=ngircd-alex.git diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 79be0005..dbf26fe2 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-channel.c,v 1.27 2004/04/09 20:46:48 alex Exp $"; +static char UNUSED id[] = "$Id: irc-channel.c,v 1.31 2005/09/02 12:50:25 alex Exp $"; #include "imp.h" #include @@ -40,14 +40,14 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.27 2004/04/09 20:46:48 alex Ex #include "irc-channel.h" -GLOBAL BOOLEAN +GLOBAL bool IRC_JOIN( CLIENT *Client, REQUEST *Req ) { - CHAR *channame, *key, *flags, *topic, modes[8]; - BOOLEAN is_new_chan, is_invited, is_banned; + char *channame, *key, *flags, *topic, modes[8]; + bool is_new_chan, is_invited, is_banned; CLIENT *target; CHANNEL *chan; - + assert( Client != NULL ); assert( Req != NULL ); @@ -71,8 +71,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) chan = NULL; flags = NULL; /* wird der Channel neu angelegt? */ - if( Channel_Search( channame )) is_new_chan = FALSE; - else is_new_chan = TRUE; + if( Channel_Search( channame )) is_new_chan = false; + else is_new_chan = true; /* Hat ein Server Channel-User-Modes uebergeben? */ if( Client_Type( Client ) == CLIENT_SERVER ) @@ -115,7 +115,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) is_invited = Lists_CheckInvited( target, chan ); /* Testen, ob Client gebanned ist */ - if(( is_banned == TRUE ) && ( is_invited == FALSE )) + if(( is_banned == true) && ( is_invited == false )) { /* Client ist gebanned (und nicht invited): */ IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame ); @@ -126,7 +126,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } /* Ist der Channel "invite-only"? */ - if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE )) + if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == false )) { /* Channel ist "invite-only" und Client wurde nicht invited: */ IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame ); @@ -167,7 +167,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) * commands) in this list become deleted when a user * joins a channel this way. */ chan = Channel_Search( channame ); - if( chan != NULL ) (VOID)Lists_CheckInvited( target, chan ); + if( chan != NULL ) (void)Lists_CheckInvited( target, chan ); } /* Channel joinen (und ggf. anlegen) */ @@ -199,11 +199,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes ); /* im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame ); + IRC_WriteStrChannelPrefix( Client, chan, target, false, "JOIN :%s", channame ); if( modes[1] ) { /* Modes im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target )); + IRC_WriteStrChannelPrefix( Client, chan, target, false, "MODE %s +%s %s", channame, &modes[1], Client_ID( target )); } if( Client_Type( Client ) == CLIENT_USER ) @@ -211,9 +211,18 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* an Client bestaetigen */ IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame ); - /* Topic an Client schicken */ - topic = Channel_Topic( chan ); - if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic ); + /* Send topic to client, if any */ + topic = Channel_Topic(chan); + if (*topic) { + IRC_WriteStrClient(Client, RPL_TOPIC_MSG, + Client_ID(Client), channame, topic); +#ifndef STRICT_RFC + IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG, + Client_ID(Client), channame, + Channel_TopicWho(chan), + Channel_TopicTime(chan)); +#endif + } /* Mitglieder an Client Melden */ IRC_Send_NAMES( Client, chan ); @@ -227,11 +236,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } /* IRC_JOIN */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PART( CLIENT *Client, REQUEST *Req ) { CLIENT *target; - CHAR *chan; + char *chan; assert( Client != NULL ); assert( Req != NULL ); @@ -262,12 +271,13 @@ IRC_PART( CLIENT *Client, REQUEST *Req ) } /* IRC_PART */ -GLOBAL BOOLEAN +GLOBAL bool IRC_TOPIC( CLIENT *Client, REQUEST *Req ) { CHANNEL *chan; CLIENT *from; - CHAR *topic; + char *topic; + bool r; assert( Client != NULL ); assert( Req != NULL ); @@ -288,10 +298,22 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) if( Req->argc == 1 ) { - /* Topic erfragen */ - topic = Channel_Topic( chan ); - if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic ); - else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan )); + /* Request actual topic */ + topic = Channel_Topic(chan); + if (*topic) { + r = IRC_WriteStrClient(from, RPL_TOPIC_MSG, + Client_ID(Client), Channel_Name(chan), topic); +#ifndef STRICT_RFC + r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG, + Client_ID(Client), Channel_Name(chan), + Channel_TopicWho(chan), + Channel_TopicTime(chan)); +#endif + return r; + } + else + return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG, + Client_ID(from), Channel_Name(chan)); } if( strchr( Channel_Modes( chan ), 't' )) @@ -300,84 +322,115 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); } - /* Topic setzen */ - Channel_SetTopic( chan, Req->argv[1] ); - Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "" ); + /* Set new topic */ + Channel_SetTopic(chan, from, Req->argv[1]); + Log(LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", + Client_Mask(from), Channel_Name(chan), + Req->argv[1][0] ? Req->argv[1] : ""); /* im Channel bekannt machen und an Server weiterleiten */ IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); + IRC_WriteStrChannelPrefix( Client, chan, from, false, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); else return CONNECTED; } /* IRC_TOPIC */ -GLOBAL BOOLEAN +/** + * Handler for the IRC "LIST" command. + * This implementation handles the local case as well as the forwarding of the + * LIST command to other servers in the IRC network. + */ +GLOBAL bool IRC_LIST( CLIENT *Client, REQUEST *Req ) { - CHAR *pattern; + char *pattern; CHANNEL *chan; CLIENT *from, *target; assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ - if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Bad number of prameters? */ + if( Req->argc > 2 ) + return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID( Client ), Req->command ); - if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," ); - else pattern = "*"; + if( Req->argc > 0 ) + pattern = strtok( Req->argv[0], "," ); + else + pattern = "*"; - /* From aus Prefix ermitteln */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); + /* Get sender from prefix, if any */ + if( Client_Type( Client ) == CLIENT_SERVER ) + from = Client_Search( Req->prefix ); + else + from = Client; + + if( ! from ) + return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, + Client_ID( Client ), Req->prefix ); if( Req->argc == 2 ) { - /* an anderen Server forwarden */ + /* Forward to other server? */ target = Client_Search( Req->argv[1] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); + if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) + return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, + Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { - /* Ok, anderer Server ist das Ziel: forwarden */ - return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] ); + /* Target is indeed an other server, forward it! */ + return IRC_WriteStrClientPrefix( target, from, + "LIST %s :%s", Client_ID( from ), + Req->argv[1] ); } } while( pattern ) { - /* alle Channel durchgehen */ + /* Loop through all the channels */ chan = Channel_First( ); while( chan ) { - /* Passt die Suchmaske auf diesen Channel? */ + /* Check search pattern */ if( Match( pattern, Channel_Name( chan ))) { - /* Treffer! */ - if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; + /* Gotcha! */ + if( ! strchr( Channel_Modes( chan ), 's' ) || + Channel_IsMemberOf( chan, from )) + { + if( ! IRC_WriteStrClient( from, + RPL_LIST_MSG, Client_ID( from ), + Channel_Name( chan ), + Channel_MemberCount( chan ), + Channel_Topic( chan ))) + return DISCONNECTED; + } } chan = Channel_Next( chan ); } - /* naechsten Namen ermitteln */ - if( Req->argc > 0 ) pattern = strtok( NULL, "," ); - else pattern = NULL; + /* Get next name ... */ + if( Req->argc > 0 ) + pattern = strtok( NULL, "," ); + else + pattern = NULL; } - return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from ); + return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from )); } /* IRC_LIST */ -GLOBAL BOOLEAN +GLOBAL bool IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) { - CHAR modes_add[COMMAND_LEN], l[16], *ptr; + char modes_add[COMMAND_LEN], l[16], *ptr; CLIENT *from; CHANNEL *chan; - INT arg_topic; + int arg_topic; assert( Client != NULL ); assert( Req != NULL ); @@ -437,7 +490,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) } /* Inform members of this channel */ - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add ); + IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add ); } } else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" ); @@ -449,8 +502,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) if(( ! *ptr ) && ( Req->argv[arg_topic][0] )) { /* OK, there is no topic jet */ - Channel_SetTopic( chan, Req->argv[arg_topic] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan )); + Channel_SetTopic(chan, Client, Req->argv[arg_topic]); + IRC_WriteStrChannelPrefix(Client, chan, from, false, + "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan)); } }