X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=dbf26fe2bec01fe806e42962bb5cdf53d47610f9;hp=90b0c0974514a169dc1833a349f6f2689bccfac3;hb=ca32c1b311379445d1c8bee5705a9371cf2fa1a7;hpb=8adff5922376676c2eeb49de1cbab86cc345b887 diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 90b0c097..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.29 2005/03/19 18:43:48 fw Exp $"; +static char UNUSED id[] = "$Id: irc-channel.c,v 1.31 2005/09/02 12:50:25 alex Exp $"; #include "imp.h" #include @@ -47,7 +47,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) bool is_new_chan, is_invited, is_banned; CLIENT *target; CHANNEL *chan; - + assert( Client != NULL ); assert( Req != NULL ); @@ -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 ); @@ -268,6 +277,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) CHANNEL *chan; CLIENT *from; 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,9 +322,11 @@ 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] ); @@ -313,6 +337,11 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) } /* IRC_TOPIC */ +/** + * 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 ) { @@ -323,27 +352,40 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) 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] ); } } @@ -360,18 +402,25 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) if( ! strchr( Channel_Modes( chan ), 's' ) || Channel_IsMemberOf( chan, from )) { - if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; + 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 */ @@ -453,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)); } }