X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..e36c166d4959b0db327c62dfea13ba4fab639b17:/modules/m_whois.c diff --git a/modules/m_whois.c b/modules/m_whois.c index ef60a55..ca8dc23 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -21,11 +21,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_whois.c 1879 2006-08-27 21:18:43Z jilles $ + * $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $ */ #include "stdinc.h" -#include "tools.h" #include "common.h" #include "client.h" #include "hash.h" @@ -36,10 +35,9 @@ #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" @@ -67,11 +65,10 @@ mapi_hlist_av1 whois_hlist[] = { { NULL, NULL } }; -DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 1879 $"); +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 @@ -91,16 +88,16 @@ 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()) { 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) != @@ -117,7 +114,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 */ @@ -191,7 +187,10 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char 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) { @@ -199,9 +198,9 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char { 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); } @@ -210,7 +209,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char 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]); @@ -230,8 +229,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,29 +237,20 @@ 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; - if(target_p->user == NULL) { s_assert(0); 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); @@ -280,28 +269,31 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) t = buf + mlen; - DLINK_FOREACH(ptr, target_p->user->channel.head) + if (!IsService(target_p)) { - msptr = ptr->data; - chptr = msptr->chptr; + RB_DLINK_FOREACH(ptr, target_p->user->channel.head) + { + msptr = ptr->data; + chptr = msptr->chptr; - visible = IsService(target_p) ? IsMember(source_p, chptr) : ShowChannel(source_p, chptr); + visible = ShowChannel(source_p, chptr); - if(visible || operspy) - { - if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5)) + if(visible || operspy) { - sendto_one(source_p, "%s", buf); - cur_len = mlen + extra_space; - t = buf + mlen; + if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5)) + { + sendto_one(source_p, "%s", buf); + cur_len = mlen + extra_space; + t = buf + mlen; + } + + tlen = rb_sprintf(t, "%s%s%s ", + visible ? "" : "!", + find_channel_status(msptr, 1), + chptr->chname); + t += tlen; + cur_len += tlen; } - - tlen = ircsprintf(t, "%s%s%s ", - visible ? "" : "!", - find_channel_status(msptr, 1), - chptr->chname); - t += tlen; - cur_len += tlen; } } @@ -309,8 +301,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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), @@ -325,6 +317,10 @@ 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(MyClient(target_p)) { if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p)) @@ -346,7 +342,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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 @@ -368,7 +364,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) target_p->name, target_p->sockhost); } - } hdata.client = source_p;