X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c88cdb00957d1bafae4587343b5ab7df14b75f8b..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_whois.c?ds=inline diff --git a/modules/m_whois.c b/modules/m_whois.c index 14781190..65b169b0 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -25,7 +25,6 @@ */ #include "stdinc.h" -#include "tools.h" #include "common.h" #include "client.h" #include "hash.h" @@ -36,15 +35,16 @@ #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 "ipv4_from_ipv6.h" +#include "ratelimit.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); @@ -71,7 +71,6 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision /* * m_whois - * parv[0] = sender prefix * parv[1] = nickname masklist */ static int @@ -91,7 +90,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * 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() || !ratelimit_client(source_p, 2)) { sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "WHOIS"); @@ -100,7 +99,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * 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) != @@ -117,7 +116,6 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * /* * ms_whois - * parv[0] = sender prefix * parv[1] = server to reply * parv[2] = nickname to whois */ @@ -192,14 +190,13 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char } target_p = find_named_person(nick); - if(target_p != NULL) { if(operspy) { 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->servptr->name); report_operspy(source_p, "WHOIS", buffer); @@ -230,8 +227,7 @@ static void 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; @@ -239,15 +235,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) char *t; int tlen; hook_data_client hdata; - char *name; - char quest[] = "?"; int visible; int extra_space = 0; - - if(target_p->name[0] == '\0') - name = quest; - else - name = target_p->name; +#ifdef RB_IPV6 + struct sockaddr_in ip4; +#endif if(target_p->user == NULL) { @@ -255,13 +247,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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); @@ -282,7 +272,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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; @@ -298,7 +288,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) t = buf + mlen; } - tlen = ircsprintf(t, "%s%s%s ", + tlen = rb_sprintf(t, "%s%s%s ", visible ? "" : "!", find_channel_status(msptr, 1), chptr->chname); @@ -313,7 +303,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) sendto_one_numeric(source_p, RPL_WHOISSERVER, form_str(RPL_WHOISSERVER), target_p->name, target_p->servptr->name, - a2client_p ? a2client_p->info : "*Not On This Net*"); + target_p->servptr->info); if(target_p->user->away) sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY), @@ -328,6 +318,15 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) GlobalSetOptions.operstring)); } + 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(MyClient(target_p)) { if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p)) @@ -347,9 +346,23 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) form_str(RPL_WHOISACTUALLY), target_p->name, target_p->sockhost); +#ifdef RB_IPV6 + if (target_p->localClient->ip.ss_family == AF_INET6 && + (show_ip(source_p, target_p) || + (source_p == target_p && !IsIPSpoof(target_p))) && + ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4)) + { + rb_inet_ntop_sock((struct sockaddr *)&ip4, + buf, sizeof buf); + sendto_one_numeric(source_p, RPL_WHOISTEXT, + "%s :Underlying IPv4 is %s", + target_p->name, buf); + } +#endif /* RB_IPV6 */ + 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 @@ -371,7 +384,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) target_p->name, target_p->sockhost); } - } hdata.client = source_p;