* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_whois.c 3287 2007-03-28 13:49:57Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "common.h"
#include "client.h"
#include "hash.h"
#include "s_conf.h"
#include "s_serv.h"
#include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
#include "hook.h"
#include "s_newconf.h"
+#include "s_user.h"
static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
{ NULL, NULL }
};
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3287 $");
+DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
/*
* m_whois
- * parv[0] = sender prefix
* parv[1] = nickname masklist
*/
static int
if(!IsOper(source_p))
{
/* seeing as this is going across servers, we should limit it */
- if((last_used + ConfigFileEntry.pace_wait_simple) > CurrentTime)
+ if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time())
{
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "WHOIS");
sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
- form_str(RPL_ENDOFWHOIS), parv[1]);
+ form_str(RPL_ENDOFWHOIS), parv[2]);
return 0;
}
else
- last_used = CurrentTime;
+ last_used = rb_current_time();
}
if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) !=
/*
* ms_whois
- * parv[0] = sender prefix
* parv[1] = server to reply
* parv[2] = nickname to whois
*/
nick++;
}
- target_p = find_named_person(nick);
+ if(MyClient(source_p))
+ target_p = find_named_person(nick);
+ else
+ target_p = find_person(nick);
if(target_p != NULL)
{
{
char buffer[BUFSIZE];
- snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+ rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
target_p->name, target_p->username,
- target_p->host, target_p->user->server);
+ target_p->host, target_p->servptr->name);
report_operspy(source_p, "WHOIS", buffer);
}
else
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK),
- IsDigit(*nick) ? "*" : nick);
+ nick);
sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
form_str(RPL_ENDOFWHOIS), parv[1]);
single_whois(struct Client *source_p, struct Client *target_p, int operspy)
{
char buf[BUFSIZE];
- dlink_node *ptr;
- struct Client *a2client_p;
+ rb_dlink_node *ptr;
struct membership *msptr;
struct Channel *chptr;
int cur_len = 0;
char *t;
int tlen;
hook_data_client hdata;
- char *name;
- char quest[] = "?";
int visible;
int extra_space = 0;
+ int i;
+ char *m;
+ int showsecret = 0;
+ struct Metadata *md;
- if(target_p->name[0] == '\0')
- name = quest;
- else
- name = target_p->name;
+ if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
+ showsecret = 1;
if(target_p->user == NULL)
{
return;
}
- a2client_p = target_p->servptr;
-
sendto_one_numeric(source_p, RPL_WHOISUSER, form_str(RPL_WHOISUSER),
target_p->name, target_p->username,
target_p->host, target_p->info);
- cur_len = mlen = ircsprintf(buf, form_str(RPL_WHOISCHANNELS),
+ cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
get_id(&me, source_p), get_id(source_p, source_p),
target_p->name);
if (!IsService(target_p))
{
- DLINK_FOREACH(ptr, target_p->user->channel.head)
+ RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
{
msptr = ptr->data;
chptr = msptr->chptr;
visible = ShowChannel(source_p, chptr);
- if(visible || operspy)
+ if(visible || operspy || showsecret)
{
if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
{
t = buf + mlen;
}
- tlen = ircsprintf(t, "%s%s%s ",
- visible ? "" : "!",
+ tlen = rb_sprintf(t, "%s%s%s ",
+ visible ? "" : "*",
find_channel_status(msptr, 1),
chptr->chname);
t += tlen;
sendto_one(source_p, "%s", buf);
sendto_one_numeric(source_p, RPL_WHOISSERVER, form_str(RPL_WHOISSERVER),
- target_p->name, target_p->user->server,
- a2client_p ? a2client_p->info : "*Not On This Net*");
+ target_p->name, target_p->servptr->name,
+ target_p->servptr->info);
if(target_p->user->away)
sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
if(IsOper(target_p))
{
- sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
- target_p->name,
- IsService(target_p) ? ConfigFileEntry.servicestring :
- (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
- GlobalSetOptions.operstring));
+ if((md = user_metadata_find(target_p, "OPERSTRING")) != NULL)
+ sendto_one_numeric(source_p, 313, "%s :%s", target_p->name, md->value);
+ else
+ sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
+ target_p->name,
+ IsService(target_p) ? ConfigFileEntry.servicestring :
+ (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
+ GlobalSetOptions.operstring));
+ if((md = user_metadata_find(target_p, "SWHOIS")) != NULL)
+ sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
+ }
+
+ if(IsSSLClient(target_p))
+ sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
+ target_p->name);
+ if((source_p == target_p || IsOper(source_p)) &&
+ target_p->certfp != NULL)
+ sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+ form_str(RPL_WHOISCERTFP),
+ target_p->name, target_p->certfp);
+
+ if(IsSetBot(target_p))
+ sendto_one_numeric(source_p, RPL_WHOISBOT,
+ form_str(RPL_WHOISBOT),
+ target_p->name);
+ if(IsOper(source_p))
+ {
+ m = buf;
+ *m++ = '+';
+
+ for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+ if (target_p->umodes & user_modes[i])
+ *m++ = (char) i;
+ *m = '\0';
+
+ sendto_one_numeric(source_p, RPL_WHOISMODES,
+ form_str(RPL_WHOISMODES),
+ target_p->name, buf);
}
if(MyClient(target_p))
sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
target_p->name,
- CurrentTime - target_p->localClient->last,
+ rb_current_time() - target_p->localClient->last,
target_p->localClient->firsttime);
}
else
target_p->name, target_p->sockhost);
}
-
}
hdata.client = source_p;
projects / irc / rqf / shadowircd.git / blobdiff