/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "match.h"
#include "tool.h"
#include "parse.h"
+#include "irc.h"
#include "irc-write.h"
+#include "client-cap.h"
#include "exp.h"
#include "irc-info.h"
target = Client_Search(Req->argv[0]);
else
target = Client_ThisServer();
-
+
/* Make sure that the target is a server */
if (target && Client_Type(target) != CLIENT_SERVER)
target = Client_Introducer(target);
} /* IRC_INFO */
+/**
+ * Handler for the IRC "ISON" command.
+ *
+ * See RFC 2812, 4.9 "Ison message".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
GLOBAL bool
IRC_ISON( CLIENT *Client, REQUEST *Req )
{
char *ptr;
int i;
- assert( Client != NULL );
- assert( Req != NULL );
+ assert(Client != NULL);
+ assert(Req != NULL);
- /* Falsche Anzahl Parameter? */
- if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Bad number of arguments? */
+ if (Req->argc < 1)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
- strlcpy( rpl, RPL_ISON_MSG, sizeof rpl );
- for( i = 0; i < Req->argc; i++ )
- {
- ptr = strtok( Req->argv[i], " " );
- while( ptr )
- {
- ngt_TrimStr( ptr );
- c = Client_Search( ptr );
- if( c && ( Client_Type( c ) == CLIENT_USER ))
- {
- /* Dieser Nick ist "online" */
- strlcat( rpl, ptr, sizeof( rpl ));
- strlcat( rpl, " ", sizeof( rpl ));
+ strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
+ for (i = 0; i < Req->argc; i++) {
+ /* "All" ircd even parse ":<x> <y> ..." arguments and split
+ * them up; so we do the same ... */
+ ptr = strtok(Req->argv[i], " ");
+ while (ptr) {
+ ngt_TrimStr(ptr);
+ c = Client_Search(ptr);
+ if (c && Client_Type(c) == CLIENT_USER) {
+ strlcat(rpl, Client_ID(c), sizeof(rpl));
+ strlcat(rpl, " ", sizeof(rpl));
}
- ptr = strtok( NULL, " " );
+ ptr = strtok(NULL, " ");
}
}
ngt_TrimLastChr(rpl, ' ');
- return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+ return IRC_WriteStrClient(Client, rpl, Client_ID(Client));
} /* IRC_ISON */
+/**
+ * Handler for the IRC "LINKS" command.
+ *
+ * See RFC 2812, 3.4.5 "Links message".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
GLOBAL bool
-IRC_LINKS( CLIENT *Client, REQUEST *Req )
+IRC_LINKS(CLIENT *Client, REQUEST *Req)
{
CLIENT *target, *from, *c;
char *mask;
- assert( Client != NULL );
- assert( Req != NULL );
+ assert(Client != NULL);
+ assert(Req != NULL);
- if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ IRC_SetPenalty(Client, 1);
- /* Server-Mask ermitteln */
- if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1];
- else mask = "*";
+ if (Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
- /* Absender ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
- else from = Client;
- if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+ /* Get pointer to server mask or "*", if none given */
+ if (Req->argc > 0)
+ mask = Req->argv[Req->argc - 1];
+ else
+ mask = "*";
- /* An anderen Server forwarden? */
- if( Req->argc == 2 )
- {
- target = Client_Search( Req->argv[0] );
- if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
- else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] );
- }
+ if (Client_Type(Client) == CLIENT_SERVER)
+ from = Client_Search(Req->prefix);
+ else
+ from = Client;
+ if (!from)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client), Req->prefix);
- /* Wer ist der Absender? */
- if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
- else target = Client;
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+ /* Forward? */
+ if (Req->argc == 2) {
+ target = Client_Search(Req->argv[0]);
+ if (! target || Client_Type(target) != CLIENT_SERVER)
+ return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+ Client_ID(from),
+ Req->argv[0] );
+ else
+ if (target != Client_ThisServer())
+ return IRC_WriteStrClientPrefix(target, from,
+ "LINKS %s %s", Req->argv[0],
+ Req->argv[1]);
+ }
- c = Client_First( );
- while( c )
- {
- if( Client_Type( c ) == CLIENT_SERVER )
- {
- if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+ c = Client_First();
+ while (c) {
+ if (Client_Type(c) == CLIENT_SERVER
+ && MatchCaseInsensitive(mask, Client_ID(c))) {
+ if (!IRC_WriteStrClient(from, RPL_LINKS_MSG,
+ Client_ID(from), Client_ID(c),
+ Client_ID(Client_TopServer(c)
+ ? Client_TopServer(c)
+ : Client_ThisServer()),
+ Client_Hops(c), Client_Info(c)))
+ return DISCONNECTED;
}
- c = Client_Next( c );
+ c = Client_Next(c);
}
-
- IRC_SetPenalty( target, 1 );
- return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
+ return IRC_WriteStrClient(from, RPL_ENDOFLINKS_MSG,
+ Client_ID(from), mask);
} /* IRC_LINKS */
* therefore answers with ERR_SUMMONDISABLED.
*/
GLOBAL bool
-IRC_SUMMON(CLIENT * Client, REQUEST * Req)
+IRC_SUMMON(CLIENT * Client, UNUSED REQUEST * Req)
{
return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG,
- Client_ID(Client), Req->command);
+ Client_ID(Client));
} /* IRC_SUMMON */
* See RFC 2812 section 4.6. As suggested there the command is disabled.
*/
GLOBAL bool
-IRC_USERS(CLIENT * Client, REQUEST * Req)
+IRC_USERS(CLIENT * Client, UNUSED REQUEST * Req)
{
return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG,
- Client_ID(Client), Req->command);
+ Client_ID(Client));
} /* IRC_USERS */
}
-static const char *
-who_flags_qualifier(const char *chan_user_modes)
+/**
+ * Return channel user mode prefix(es).
+ *
+ * @param Client The client requesting the mode prefixes.
+ * @param chan_user_modes String with channel user modes.
+ * @param str String buffer to which the prefix(es) will be appended.
+ * @param len Size of "str" buffer.
+ * @return Pointer to "str".
+ */
+static char *
+who_flags_qualifier(CLIENT *Client, const char *chan_user_modes,
+ char *str, size_t len)
{
- if (strchr(chan_user_modes, 'o'))
- return "@";
+ assert(Client != NULL);
+
+ if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) {
+ if (strchr(chan_user_modes, 'q'))
+ strlcat(str, "~", len);
+ if (strchr(chan_user_modes, 'a'))
+ strlcat(str, "&", len);
+ if (strchr(chan_user_modes, 'o'))
+ strlcat(str, "@", len);
+ if (strchr(chan_user_modes, 'h'))
+ strlcat(str, "%", len);
+ if (strchr(chan_user_modes, 'v'))
+ strlcat(str, "+", len);
+
+ return str;
+ }
+
+ if (strchr(chan_user_modes, 'q'))
+ strlcat(str, "~", len);
+ else if (strchr(chan_user_modes, 'a'))
+ strlcat(str, "&", len);
+ else if (strchr(chan_user_modes, 'o'))
+ strlcat(str, "@", len);
+ else if (strchr(chan_user_modes, 'h'))
+ strlcat(str, "%", len);
else if (strchr(chan_user_modes, 'v'))
- return "+";
- return "";
+ strlcat(str, "+", len);
+
+ return str;
}
+/**
+ * Send WHO reply for a "channel target" ("WHO #channel").
+ *
+ * @param Client Client requesting the information.
+ * @param Chan Channel being requested.
+ * @param OnlyOps Only display IRC operators.
+ * @return CONNECTED or DISCONNECTED.
+ */
static bool
-IRC_Send_WHO(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
+IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
{
bool is_visible, is_member, is_ircop;
CL2CHAN *cl2chan;
const char *client_modes;
- const char *chan_user_modes;
- char flags[8];
+ char flags[10];
CLIENT *c;
+ int count = 0;
assert( Client != NULL );
assert( Chan != NULL );
+ IRC_SetPenalty(Client, 1);
+
is_member = Channel_IsMemberOf(Chan, Client);
/* Secret channel? */
if (!is_member && strchr(Channel_Modes(Chan), 's'))
- return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), Channel_Name(Chan));
+ return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG,
+ Client_ID(Client), Channel_Name(Chan));
cl2chan = Channel_FirstMember(Chan);
for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) {
if (is_ircop)
strlcat(flags, "*", sizeof(flags));
- chan_user_modes = Channel_UserModes(Chan, c);
- strlcat(flags, who_flags_qualifier(chan_user_modes), sizeof(flags));
+ who_flags_qualifier(Client, Channel_UserModes(Chan, c),
+ flags, sizeof(flags));
- if (!write_whoreply(Client, c, Channel_Name(Chan), flags))
+ if (!write_whoreply(Client, c, Channel_Name(Chan),
+ flags))
return DISCONNECTED;
+ count++;
}
}
- return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), Channel_Name(Chan));
-} /* IRC_Send_WHO */
+ /* If there are a lot of clients, augment penalty a bit */
+ if (count > MAX_RPL_WHO)
+ IRC_SetPenalty(Client, 1);
-GLOBAL bool
-IRC_WHO( CLIENT *Client, REQUEST *Req )
+ return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client),
+ Channel_Name(Chan));
+}
+
+
+/**
+ * Send WHO reply for a "mask target" ("WHO m*sk").
+ *
+ * @param Client Client requesting the information.
+ * @param Mask Mask being requested or NULL for "all" clients.
+ * @param OnlyOps Only display IRC operators.
+ * @return CONNECTED or DISCONNECTED.
+ */
+static bool
+IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
{
- bool only_ops, have_arg, client_match;
- const char *channelname, *client_modes, *chan_user_modes;
- char pattern[COMMAND_LEN];
- char flags[4];
- CL2CHAN *cl2chan;
- CHANNEL *chan, *cn;
CLIENT *c;
+ CL2CHAN *cl2chan;
+ CHANNEL *chan;
+ bool client_match, is_visible;
+ char flags[4];
+ int count = 0;
- assert( Client != NULL );
- assert( Req != NULL );
-
- if (Req->argc > 2)
- return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ assert (Client != NULL);
- only_ops = false;
- have_arg = false;
-
- if (Req->argc == 2) {
- if (strcmp(Req->argv[1], "o") == 0)
- only_ops = true;
-#ifdef STRICT_RFC
- else return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command);
-#endif
- }
-
- IRC_SetPenalty(Client, 1);
- if (Req->argc >= 1) { /* Channel or Mask. */
- chan = Channel_Search(Req->argv[0]);
- if (chan)
- return IRC_Send_WHO(Client, chan, only_ops);
- if (strcmp(Req->argv[0], "0") != 0) { /* RFC stupidity, same as no arguments */
- have_arg = true;
- strlcpy(pattern, Req->argv[0], sizeof(pattern));
- ngt_LowerStr(pattern);
- IRC_SetPenalty(Client, 3);
- }
- }
+ if (Mask)
+ ngt_LowerStr(Mask);
+ IRC_SetPenalty(Client, 3);
for (c = Client_First(); c != NULL; c = Client_Next(c)) {
if (Client_Type(c) != CLIENT_USER)
continue;
- /*
- * RFC 2812, 3.6.1:
- * In the absence of the parameter, all visible (users who aren't
- * invisible (user mode +i) and who don't have a common channel
- * with the requesting client) are listed.
- *
- * The same result can be achieved by using a [sic] of "0"
- * or any wildcard which will end up matching every visible user.
- *
- * The [sic] passed to WHO is matched against users' host, server, real name and
- * nickname if the channel cannot be found.
- */
- client_modes = Client_Modes(c);
- if (strchr(client_modes, 'i'))
- continue;
- if (only_ops && !strchr(client_modes, 'o'))
+ if (OnlyOps && !Client_HasMode(c, 'o'))
continue;
- if (have_arg) { /* match pattern against user host/server/name/nick */
- client_match = MatchCaseInsensitive(pattern, Client_Hostname(c)); /* user's host */
+ if (Mask) {
+ /* Match pattern against user host/server/name/nick */
+ client_match = MatchCaseInsensitive(Mask,
+ Client_Hostname(c));
if (!client_match)
- client_match = MatchCaseInsensitive(pattern, Client_ID(Client_Introducer(c))); /* server */
+ client_match = MatchCaseInsensitive(Mask,
+ Client_ID(Client_Introducer(c)));
if (!client_match)
- client_match = Match(Req->argv[0], Client_Info(c)); /* realname */
+ client_match = MatchCaseInsensitive(Mask,
+ Client_Info(c));
if (!client_match)
- client_match = MatchCaseInsensitive(pattern, Client_ID(c)); /* nick name */
-
- if (!client_match) /* This isn't the client you're looking for */
- continue;
+ client_match = MatchCaseInsensitive(Mask,
+ Client_ID(c));
+ if (!client_match)
+ continue; /* no match: skip this client */
}
- strcpy(flags, who_flags_status(client_modes));
+ is_visible = !Client_HasMode(c, 'i');
- if (strchr(client_modes, 'o')) /* this client is an operator */
- strlcat(flags, "*", sizeof(flags));
+ /* Target client is invisible, but mask matches exactly? */
+ if (!is_visible && Mask && strcasecmp(Client_ID(c), Mask) == 0)
+ is_visible = true;
- /* Search suitable channel */
- cl2chan = Channel_FirstChannelOf(c);
- while (cl2chan) {
- cn = Channel_GetChannel(cl2chan);
- if (Channel_IsMemberOf(cn, Client) ||
- !strchr(Channel_Modes(cn), 's'))
- {
- channelname = Channel_Name(cn);
- break;
+ /* Target still invisible, but are both on the same channel? */
+ if (!is_visible) {
+ cl2chan = Channel_FirstChannelOf(Client);
+ while (cl2chan && !is_visible) {
+ chan = Channel_GetChannel(cl2chan);
+ if (Channel_IsMemberOf(chan, c))
+ is_visible = true;
+ cl2chan = Channel_NextChannelOf(Client, cl2chan);
}
- cl2chan = Channel_NextChannelOf(c, cl2chan);
}
- if (cl2chan) {
- chan = Channel_GetChannel(cl2chan);
- chan_user_modes = Channel_UserModes(chan, c);
- strlcat(flags, who_flags_qualifier(chan_user_modes), sizeof(flags));
- } else
- channelname = "*";
-
- if (!write_whoreply(Client, c, channelname, flags))
+
+ if (!is_visible) /* target user is not visible */
+ continue;
+
+ if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
+ break;
+
+ strcpy(flags, who_flags_status(Client_Modes(c)));
+ if (strchr(Client_Modes(c), 'o'))
+ strlcat(flags, "*", sizeof(flags));
+
+ if (!write_whoreply(Client, c, "*", flags))
return DISCONNECTED;
+ count++;
}
- if (Req->argc > 0)
- channelname = Req->argv[0];
- else
- channelname = "*";
+ return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client),
+ Mask ? Mask : "*");
+}
+
+
+/**
+ * Handler for the IRC "WHO" command.
+ *
+ * See RFC 2812, 3.6.1 "Who query".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_WHO(CLIENT *Client, REQUEST *Req)
+{
+ bool only_ops;
+ CHANNEL *chan;
+
+ assert (Client != NULL);
+ assert (Req != NULL);
+
+ if (Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ only_ops = false;
+
+ if (Req->argc == 2) {
+ if (strcmp(Req->argv[1], "o") == 0)
+ only_ops = true;
+#ifdef STRICT_RFC
+ else
+ return IRC_WriteStrClient(Client,
+ ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client),
+ Req->command);
+#endif
+ }
+
+ IRC_SetPenalty(Client, 1);
+ if (Req->argc >= 1) {
+ /* Channel or mask given */
+ chan = Channel_Search(Req->argv[0]);
+ if (chan) {
+ /* Members of a channel have been requested */
+ return IRC_WHO_Channel(Client, chan, only_ops);
+ }
+ if (strcmp(Req->argv[0], "0") != 0) {
+ /* A mask has been given. But please note this RFC
+ * stupidity: "0" is same as no arguments ... */
+ return IRC_WHO_Mask(Client, Req->argv[0], only_ops);
+ }
+ }
- return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), channelname);
+ /* No channel or (valid) mask given */
+ IRC_SetPenalty(Client, 2);
+ return IRC_WHO_Mask(Client, NULL, only_ops);
} /* IRC_WHO */
/**
* Generate WHOIS reply of one actual client.
*
- * @param Client The client from which this command has been received.
- * @param from The client requesting the information ("originator").
- * @param c The client of which information should be returned.
- * @returns CONNECTED or DISCONNECTED.
+ * @param Client The client from which this command has been received.
+ * @param from The client requesting the information ("originator").
+ * @param c The client of which information should be returned.
+ * @return CONNECTED or DISCONNECTED.
*/
static bool
IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
CL2CHAN *cl2chan;
CHANNEL *chan;
+ assert(Client != NULL);
+ assert(from != NULL);
+ assert(c != NULL);
+
/* Nick, user, hostname and client info */
if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from),
Client_ID(c), Client_User(c),
if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str));
- strlcat(str, who_flags_qualifier(Channel_UserModes(chan, c)),
- sizeof(str));
+ who_flags_qualifier(Client, Channel_UserModes(chan, c),
+ str, sizeof(str));
strlcat(str, Channel_Name(chan), sizeof(str));
if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) {
/* IRC-Operator? */
if (Client_HasMode(c, 'o') &&
- !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
- Client_ID(from), Client_ID(c)))
- return DISCONNECTED;
+ !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
+ Client_ID(from), Client_ID(c)))
+ return DISCONNECTED;
+
+ /* IRC-Bot? */
+ if (Client_HasMode(c, 'B') &&
+ !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG,
+ Client_ID(from), Client_ID(c)))
+ return DISCONNECTED;
/* Connected using SSL? */
if (Conn_UsesSSL(Client_Conn(c)) &&
- !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG,
- Client_ID(from), Client_ID(c)))
+ !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from),
+ Client_ID(c)))
+ return DISCONNECTED;
+
+ /* Registered nickname? */
+ if (Client_HasMode(c, 'R') &&
+ !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
+ Client_ID(from), Client_ID(c)))
+ return DISCONNECTED;
+
+ /* Local client and requester is the user itself or an IRC Op? */
+ if (Client_Conn(c) > NONE &&
+ (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
+ /* Client hostname */
+ if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
+ Client_ID(from), Client_ID(c), Client_Hostname(c),
+ Conn_GetIPAInfo(Client_Conn(c))))
+ return DISCONNECTED;
+ /* Client modes */
+ if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG,
+ Client_ID(from), Client_ID(c), Client_Modes(c)))
return DISCONNECTED;
+ }
/* Idle and signon time (local clients only!) */
if (!Conf_MorePrivacy && Client_Conn(c) > NONE &&
- !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG,
- Client_ID(from), Client_ID(c),
- (unsigned long)Conn_GetIdle(Client_Conn(c)),
- (unsigned long)Conn_GetSignon(Client_Conn(c))))
- return DISCONNECTED;
+ !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG,
+ Client_ID(from), Client_ID(c),
+ (unsigned long)Conn_GetIdle(Client_Conn(c)),
+ (unsigned long)Conn_GetSignon(Client_Conn(c))))
+ return DISCONNECTED;
/* Away? */
if (Client_HasMode(c, 'a') &&
- !IRC_WriteStrClient(from, RPL_AWAY_MSG,
- Client_ID(from), Client_ID(c),
- Client_Away(c)))
- return DISCONNECTED;
+ !IRC_WriteStrClient(from, RPL_AWAY_MSG,
+ Client_ID(from), Client_ID(c), Client_Away(c)))
+ return DISCONNECTED;
- return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
- Client_ID(from), Client_ID(c));
+ return CONNECTED;
} /* IRC_WHOIS_SendReply */
unsigned int match_count = 0, found = 0;
bool has_wildcards, is_remote;
bool got_wildcard = false;
- const char *query;
+ char mask[COMMAND_LEN], *query;
assert( Client != NULL );
assert( Req != NULL );
/* Get target server for this command */
if (Req->argc > 1) {
/* Search the target server, which can be specified as a
- * nick name on that server as well: */
+ * nickname on that server as well: */
target = Client_Search(Req->argv[0]);
if (!target)
return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
Req->argv[0], Req->argv[1]);
is_remote = Client_Conn(from) < 0;
- for (query = strtok(Req->argv[Req->argc - 1], ",");
+ strlcpy(mask, Req->argv[Req->argc - 1], sizeof(mask));
+ for (query = strtok(ngt_LowerStr(mask), ",");
query && found < 3;
query = strtok(NULL, ","), found++)
{
* - no wildcards for remote clients
* - only one wildcard target per local client
*
- * also, at most ten matches are returned.
+ * Also, at most MAX_RPL_WHOIS matches are returned.
*/
if (!has_wildcards || is_remote) {
c = Client_Search(query);
- if (c) {
+ if (c && Client_Type(c) == CLIENT_USER) {
if (!IRC_WHOIS_SendReply(Client, from, c))
return DISCONNECTED;
} else {
got_wildcard = true;
IRC_SetPenalty(Client, 3);
- for (c = Client_First(); c && match_count < 10; c = Client_Next(c)) {
+ for (c = Client_First(); c; c = Client_Next(c)) {
+ if (IRC_CheckListTooBig(Client, match_count,
+ MAX_RPL_WHOIS, "WHOIS"))
+ break;
+
if (Client_Type(c) != CLIENT_USER)
continue;
if (!MatchCaseInsensitive(query, Client_ID(c)))
continue;
if (!IRC_WHOIS_SendReply(Client, from, c))
return DISCONNECTED;
+
match_count++;
}
if (match_count == 0)
- return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
- Client_ID(Client), Req->argv[Req->argc - 1]);
+ IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client),
+ Req->argv[Req->argc - 1]);
}
- return CONNECTED;
+ return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
+ Client_ID(from), Req->argv[Req->argc - 1]);
} /* IRC_WHOIS */
if (last < 0)
last = 0;
- max = DEFAULT_WHOWAS;
+ max = DEF_RPL_WHOWAS;
if (Req->argc > 1) {
max = atoi(Req->argv[1]);
if (max < 1)
- max = MAX_WHOWAS;
+ max = MAX_RPL_WHOWAS;
}
/*
Conn_CountMax(), Conn_CountAccepted()))
return DISCONNECTED;
#endif
-
+
return CONNECTED;
} /* IRC_Send_LUSERS */
static bool
Show_MOTD_End(CLIENT *Client)
{
- return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
+ if (!IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, Client_ID(Client)))
+ return DISCONNECTED;
+
+ if (*Conf_CloakHost)
+ return IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG,
+ Client_ID(Client),
+ Client_Hostname(Client));
+
+ return CONNECTED;
}
#ifdef SSL_SUPPORT
} /* IRC_Show_MOTD */
+/**
+ * Send NAMES reply for a specific client and channel.
+ *
+ * @param Client The client requesting the NAMES information.
+ * @param Chan The channel
+ * @return CONNECTED or DISCONNECTED.
+ */
GLOBAL bool
-IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
+IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
{
bool is_visible, is_member;
char str[LINE_LEN + 1];
CL2CHAN *cl2chan;
CLIENT *cl;
- assert( Client != NULL );
- assert( Chan != NULL );
+ assert(Client != NULL);
+ assert(Chan != NULL);
- if( Channel_IsMemberOf( Chan, Client )) is_member = true;
- else is_member = false;
+ if (Channel_IsMemberOf(Chan, Client))
+ is_member = true;
+ else
+ is_member = false;
/* Do not print info on channel memberships to anyone that is not member? */
if (Conf_MorePrivacy && !is_member)
return CONNECTED;
/* Secret channel? */
- if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED;
+ if (!is_member && strchr(Channel_Modes(Chan), 's'))
+ return CONNECTED;
- /* Alle Mitglieder suchen */
- snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
- cl2chan = Channel_FirstMember( Chan );
- while( cl2chan )
- {
- cl = Channel_GetClient( cl2chan );
+ snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, Client_ID(Client), "=",
+ Channel_Name(Chan));
+ cl2chan = Channel_FirstMember(Chan);
+ while (cl2chan) {
+ cl = Channel_GetClient(cl2chan);
- if( strchr( Client_Modes( cl ), 'i' )) is_visible = false;
- else is_visible = true;
+ if (strchr(Client_Modes(cl), 'i'))
+ is_visible = false;
+ else
+ is_visible = true;
- if( is_member || is_visible )
- {
- /* Nick anhaengen */
- if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
- if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strlcat( str, "@", sizeof( str ));
- else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strlcat( str, "+", sizeof( str ));
- strlcat( str, Client_ID( cl ), sizeof( str ));
+ if (is_member || is_visible) {
+ if (str[strlen(str) - 1] != ':')
+ strlcat(str, " ", sizeof(str));
- if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
- {
- /* Zeile wird zu lang: senden! */
- if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
- snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+ who_flags_qualifier(Client, Channel_UserModes(Chan, cl),
+ str, sizeof(str));
+ strlcat(str, Client_ID(cl), sizeof(str));
+
+ if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {
+ if (!IRC_WriteStrClient(Client, "%s", str))
+ return DISCONNECTED;
+ snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,
+ Client_ID(Client), "=",
+ Channel_Name(Chan));
}
}
- /* naechstes Mitglied suchen */
- cl2chan = Channel_NextMember( Chan, cl2chan );
+ cl2chan = Channel_NextMember(Chan, cl2chan);
}
- if( str[strlen( str ) - 1] != ':')
- {
- /* Es sind noch Daten da, die gesendet werden muessen */
- if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+ if (str[strlen(str) - 1] != ':') {
+ if (!IRC_WriteStrClient(Client, "%s", str))
+ return DISCONNECTED;
}
return CONNECTED;
return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client),
CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1,
COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1,
- COMMAND_LEN - 113);
+ COMMAND_LEN - 113, MAX_HNDL_MODES_ARG,
+ MAX_HNDL_CHANNEL_LISTS);
} /* IRC_Send_ISUPPORT */
projects / ngircd-alex.git / blobdiff