X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/7e132ff005ceacc292fc76ea94cebe0fdb79109a..1c78029cd4a17c75b0cf8197736493860c46bfd1:/modules/m_who.c diff --git a/modules/m_who.c b/modules/m_who.c index 8bb05afe..e9760943 100644 --- a/modules/m_who.c +++ b/modules/m_who.c @@ -20,11 +20,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: m_who.c 3350 2007-04-02 22:03:08Z jilles $ */ #include "stdinc.h" -#include "common.h" #include "client.h" #include "channel.h" #include "hash.h" @@ -41,6 +38,7 @@ #include "packet.h" #include "s_newconf.h" #include "ratelimit.h" +#include "supported.h" #define FIELD_CHANNEL 0x0001 #define FIELD_HOP 0x0002 @@ -56,40 +54,53 @@ #define FIELD_ACCOUNT 0x0800 #define FIELD_OPLEVEL 0x1000 /* meaningless and stupid, but whatever */ +static const char who_desc[] = + "Provides the WHO command to display information for users on a channel"; + struct who_format { int fields; const char *querytype; }; -static int m_who(struct Client *, struct Client *, int, const char **); - -struct Message who_msgtab = { - "WHO", 0, 0, 0, MFLG_SLOW, - {mg_unreg, {m_who, 2}, mg_ignore, mg_ignore, mg_ignore, {m_who, 2}} -}; - -mapi_clist_av1 who_clist[] = { &who_msgtab, NULL }; -DECLARE_MODULE_AV1(who, NULL, NULL, who_clist, NULL, NULL, "$Revision: 3350 $"); +static void m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void do_who_on_channel(struct Client *source_p, struct Channel *chptr, int server_oper, int member, struct who_format *fmt); - static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt); - static void do_who(struct Client *source_p, struct Client *target_p, struct membership *msptr, struct who_format *fmt); +struct Message who_msgtab = { + "WHO", 0, 0, 0, 0, + {mg_unreg, {m_who, 2}, mg_ignore, mg_ignore, mg_ignore, {m_who, 2}} +}; + +static int +_modinit(void) +{ + add_isupport("WHOX", isupport_string, ""); + return 0; +} + +static void +_moddeinit(void) +{ + delete_isupport("WHOX"); +} + +mapi_clist_av1 who_clist[] = { &who_msgtab, NULL }; +DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, who_desc); /* ** m_who ** parv[1] = nickname mask list ** parv[2] = additional selection flag and format options */ -static int -m_who(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; struct Client *target_p; @@ -147,17 +158,17 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa if((*(mask + 1) == '\0') && (*mask == '*')) { if(source_p->user == NULL) - return 0; + return; if((lp = source_p->user->channel.head) != NULL) { msptr = lp->data; - do_who_on_channel(source_p, msptr->chptr, server_oper, YES, &fmt); + do_who_on_channel(source_p, msptr->chptr, server_oper, true, &fmt); } sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, "*"); - return 0; + return; } if(IsOperSpy(source_p) && *mask == '!') @@ -169,7 +180,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa { sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, parv[1]); - return 0; + return; } } @@ -181,33 +192,33 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa if(chptr != NULL) { - if (!IsOper(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50)) + if (!IsOperGeneral(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50)) { sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "WHO"); sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, "*"); - return 0; + return; } if(operspy) report_operspy(source_p, "WHO", chptr->chname); if(IsMember(source_p, chptr) || operspy) - do_who_on_channel(source_p, chptr, server_oper, YES, &fmt); + do_who_on_channel(source_p, chptr, server_oper, true, &fmt); else if(!SecretChannel(chptr)) - do_who_on_channel(source_p, chptr, server_oper, NO, &fmt); + do_who_on_channel(source_p, chptr, server_oper, false, &fmt); } sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, parv[1] + operspy); - return 0; + return; } /* '/who nick' */ if(((target_p = find_named_person(mask)) != NULL) && - (!server_oper || IsOper(target_p))) + (!server_oper || SeesOper(target_p, source_p))) { int isinvis = 0; @@ -234,16 +245,16 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa else do_who(source_p, target_p, NULL, &fmt); - sendto_one(source_p, form_str(RPL_ENDOFWHO), + sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, mask); - return 0; + return; } if(!IsFloodDone(source_p)) flood_endgrace(source_p); /* it has to be a global who at this point, limit it */ - if(!IsOper(source_p)) + if(!IsOperGeneral(source_p)) { if((last_used + ConfigFileEntry.pace_wait) > rb_current_time() || !ratelimit_client(source_p, 1)) { @@ -251,7 +262,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa me.name, source_p->name, "WHO"); sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, "*"); - return 0; + return; } else last_used = rb_current_time(); @@ -273,8 +284,6 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, mask); - - return 0; } /* who_common_channel @@ -305,7 +314,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr, if(!IsInvisible(target_p) || IsMarked(target_p)) continue; - if(server_oper && !IsOper(target_p)) + if(server_oper && !SeesOper(target_p, source_p)) continue; SetMark(target_p); @@ -315,7 +324,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr, if((mask == NULL) || match(mask, target_p->name) || match(mask, target_p->username) || match(mask, target_p->host) || match(mask, target_p->servptr->name) || - (IsOper(source_p) && match(mask, target_p->orighost)) || + (IsOperGeneral(source_p) && match(mask, target_p->orighost)) || match(mask, target_p->info)) { do_who(source_p, target_p, NULL, fmt); @@ -378,7 +387,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers continue; } - if(server_oper && !IsOper(target_p)) + if(server_oper && !SeesOper(target_p, source_p)) continue; if(maxmatches > 0) @@ -386,7 +395,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers if(!mask || match(mask, target_p->name) || match(mask, target_p->username) || match(mask, target_p->host) || match(mask, target_p->servptr->name) || - (IsOper(source_p) && match(mask, target_p->orighost)) || + (IsOperGeneral(source_p) && match(mask, target_p->orighost)) || match(mask, target_p->info)) { do_who(source_p, target_p, NULL, fmt); @@ -426,7 +435,7 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr, msptr = ptr->data; target_p = msptr->client_p; - if(server_oper && !IsOper(target_p)) + if(server_oper && !SeesOper(target_p, source_p)) continue; if(member || !IsInvisible(target_p)) @@ -454,7 +463,7 @@ append_format(char *buf, size_t bufsize, size_t *pos, const char *fmt, ...) max = *pos >= bufsize ? 0 : bufsize - *pos; va_start(ap, fmt); - result = rb_vsnprintf(buf + *pos, max, fmt, ap); + result = vsnprintf(buf + *pos, max, fmt, ap); va_end(ap); *pos += result; } @@ -478,15 +487,15 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt size_t pos; const char *q; - rb_sprintf(status, "%c%s%s", - target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : ""); + sprintf(status, "%c%s%s", + target_p->user->away ? 'G' : 'H', SeesOper(target_p, source_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : ""); if (fmt->fields == 0) sendto_one(source_p, form_str(RPL_WHOREPLY), me.name, source_p->name, msptr ? msptr->chptr->chname : "*", target_p->username, target_p->host, target_p->servptr->name, target_p->name, status, - ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount, + ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount, target_p->info); else { @@ -516,7 +525,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt if (fmt->fields & FIELD_FLAGS) append_format(str, sizeof str, &pos, " %s", status); if (fmt->fields & FIELD_HOP) - append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount); + append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount); if (fmt->fields & FIELD_IDLE) append_format(str, sizeof str, &pos, " %d", (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0)); if (fmt->fields & FIELD_ACCOUNT) @@ -541,12 +550,12 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt if (pos >= sizeof str) { - static int warned = 0; + static bool warned = false; if (!warned) sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "WHOX overflow while sending information about %s to %s", target_p->name, source_p->name); - warned = 1; + warned = true; } sendto_one(source_p, "%s", str); }