albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IRC_LIST(): Added missing calls of Client_ID() and cleand up the code.

This commit is contained in:
Alexander Barton 2005-06-12 18:23:59 +00:00
parent fcf65beea4
commit 94dd7fa7d6
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/ngircd/irc-channel.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #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.30 2005/06/12 18:23:59 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -313,6 +313,11 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
} /* IRC_TOPIC */ } /* 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 GLOBAL bool
IRC_LIST( CLIENT *Client, REQUEST *Req ) IRC_LIST( CLIENT *Client, REQUEST *Req )
{ {
@ -323,27 +328,40 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
assert( Client != NULL ); assert( Client != NULL );
assert( Req != NULL ); assert( Req != NULL );
/* Falsche Anzahl Parameter? */ /* Bad number of prameters? */
if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); 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], "," ); if( Req->argc > 0 )
else pattern = "*"; pattern = strtok( Req->argv[0], "," );
else
pattern = "*";
/* From aus Prefix ermitteln */ /* Get sender from prefix, if any */
if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); if( Client_Type( Client ) == CLIENT_SERVER )
else from = Client; from = Client_Search( Req->prefix );
if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); else
from = Client;
if( ! from )
return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG,
Client_ID( Client ), Req->prefix );
if( Req->argc == 2 ) if( Req->argc == 2 )
{ {
/* an anderen Server forwarden */ /* Forward to other server? */
target = Client_Search( Req->argv[1] ); 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( )) if( target != Client_ThisServer( ))
{ {
/* Ok, anderer Server ist das Ziel: forwarden */ /* Target is indeed an other server, forward it! */
return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] ); return IRC_WriteStrClientPrefix( target, from,
"LIST %s :%s", Client_ID( from ),
Req->argv[1] );
} }
} }
@ -360,18 +378,25 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
if( ! strchr( Channel_Modes( chan ), 's' ) || if( ! strchr( Channel_Modes( chan ), 's' ) ||
Channel_IsMemberOf( chan, from )) 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 ); chan = Channel_Next( chan );
} }
/* naechsten Namen ermitteln */ /* Get next name ... */
if( Req->argc > 0 ) pattern = strtok( NULL, "," ); if( Req->argc > 0 )
else pattern = NULL; 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 */ } /* IRC_LIST */