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);
strlcat(rpl, "+", sizeof(rpl));
strlcat(rpl, Client_User(c), sizeof(rpl));
strlcat(rpl, "@", sizeof(rpl));
- strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl));
+ strlcat(rpl, Client_HostnameDisplayed(c), sizeof(rpl));
strlcat(rpl, " ", sizeof(rpl));
}
}
{
return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client),
channelname, Client_User(c),
- Client_HostnameCloaked(c),
+ Client_HostnameDisplayed(c),
Client_ID(Client_Introducer(c)), Client_ID(c),
flags, Client_Hops(c), Client_Info(c));
}
}
-static const char *
-who_flags_qualifier(CLIENT *Client, 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)
{
assert(Client != NULL);
if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) {
- if (strchr(chan_user_modes, 'o') &&
- strchr(chan_user_modes, 'v'))
- return "@+";
+ 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, 'o'))
- return "@";
+ 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;
}
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;
is_visible = strchr(client_modes, 'i') == NULL;
if (is_member || is_visible) {
- strcpy(flags, who_flags_status(client_modes));
+ strlcpy(flags, who_flags_status(client_modes),
+ sizeof(flags));
if (is_ircop)
strlcat(flags, "*", sizeof(flags));
- chan_user_modes = Channel_UserModes(Chan, c);
- strlcat(flags, who_flags_qualifier(c, 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 (Mask) {
/* Match pattern against user host/server/name/nick */
client_match = MatchCaseInsensitive(Mask,
- Client_Hostname(c));
+ Client_HostnameDisplayed(c));
if (!client_match)
client_match = MatchCaseInsensitive(Mask,
Client_ID(Client_Introducer(c)));
if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
break;
- strcpy(flags, who_flags_status(Client_Modes(c)));
+ strlcpy(flags, who_flags_status(Client_Modes(c)), sizeof(flags));
if (strchr(Client_Modes(c), 'o'))
strlcat(flags, "*", sizeof(flags));
/* Nick, user, hostname and client info */
if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from),
Client_ID(c), Client_User(c),
- Client_HostnameCloaked(c), Client_Info(c)))
+ Client_HostnameDisplayed(c), Client_Info(c)))
return DISCONNECTED;
/* Server */
if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str));
- strlcat(str, who_flags_qualifier(c, 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)) {
return DISCONNECTED;
}
+ /* Service? */
+ if (Client_Type(c) == CLIENT_SERVICE &&
+ !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG,
+ Client_ID(from), Client_ID(c)))
+ return DISCONNECTED;
+
/* IRC-Operator? */
- if (Client_HasMode(c, 'o') &&
+ if (Client_HasMode(c, 'o') && Client_Type(c) != CLIENT_SERVICE &&
!IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
Client_ID(from), Client_ID(c)))
return DISCONNECTED;
/* IRC-Bot? */
- if (Client_HasMode(c, 'B') &&
+ if (Client_HasMode(c, 'B') && Client_Type(c) != CLIENT_SERVICE &&
!IRC_WriteStrClient(from, RPL_WHOISBOT_MSG,
Client_ID(from), Client_ID(c)))
return DISCONNECTED;
Client_ID(c)))
return DISCONNECTED;
- /* Registered nick name? */
+ /* Registered nickname? */
if (Client_HasMode(c, 'R') &&
!IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
Client_ID(from), Client_ID(c)))
return DISCONNECTED;
- if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) &&
- !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from),
- Client_ID(c), Client_Hostname(c),
- Conn_GetIPAInfo(Client_Conn(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 &&
/* 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,
*/
if (!has_wildcards || is_remote) {
c = Client_Search(query);
- if (c && Client_Type(c) == CLIENT_USER) {
+ if (c && (Client_Type(c) == CLIENT_USER
+ || Client_Type(c) == CLIENT_SERVICE)) {
if (!IRC_WHOIS_SendReply(Client, from, c))
return DISCONNECTED;
} else {
Conn_CountMax(), Conn_CountAccepted()))
return DISCONNECTED;
#endif
-
+
return CONNECTED;
} /* IRC_Send_LUSERS */
if (is_member || is_visible) {
if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str));
- if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX &&
- strchr(Channel_UserModes(Chan, cl), 'o') &&
- strchr(Channel_UserModes(Chan, cl), 'v')) {
- strlcat(str, "@+", sizeof(str));
- } else {
- if (strchr(Channel_UserModes(Chan, cl), 'o'))
- strlcat(str, "@", sizeof(str));
- else if (strchr(Channel_UserModes(Chan, cl), 'v'))
- strlcat(str, "+", sizeof(str));
- }
+
+ 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)) {