* 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_names.c 254 2005-09-21 23:35:12Z nenolod $
*/
#include "stdinc.h"
-#include "sprintf_irc.h"
-#include "tools.h"
#include "channel.h"
#include "client.h"
-#include "common.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "send.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
+#include "s_newconf.h"
+
+static const char names_desc[] = "Provides the NAMES command to view users on a channel";
-static int m_names(struct Client *, struct Client *, int, const char **);
+static void m_names(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message names_msgtab = {
- "NAMES", 0, 0, 0, MFLG_SLOW,
+ "NAMES", 0, 0, 0, 0,
{mg_unreg, {m_names, 0}, mg_ignore, mg_ignore, mg_ignore, {m_names, 0}}
};
mapi_clist_av1 names_clist[] = { &names_msgtab, NULL };
-DECLARE_MODULE_AV1(names, NULL, NULL, names_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(names, NULL, NULL, names_clist, NULL, NULL, NULL, NULL, names_desc);
static void names_global(struct Client *source_p);
/*
* m_names
- * parv[0] = sender prefix
* parv[1] = channel
*/
-static int
-m_names(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static time_t last_used = 0;
struct Channel *chptr = NULL;
sendto_one_numeric(source_p, ERR_BADCHANNAME,
form_str(ERR_BADCHANNAME),
(unsigned char *) p);
- return 0;
+ return;
}
if((chptr = find_channel(p)) != NULL)
channel_member_names(chptr, source_p, 1);
else
- sendto_one(source_p, form_str(RPL_ENDOFNAMES),
+ sendto_one(source_p, form_str(RPL_ENDOFNAMES),
me.name, source_p->name, p);
}
else
{
- if(!IsOper(source_p))
+ if(!IsOperGeneral(source_p))
{
- if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+ if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
{
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "NAMES");
sendto_one(source_p, form_str(RPL_ENDOFNAMES),
me.name, source_p->name, "*");
- return 0;
+ return;
}
else
- last_used = CurrentTime;
+ last_used = rb_current_time();
}
names_global(source_p);
- sendto_one(source_p, form_str(RPL_ENDOFNAMES),
+ sendto_one(source_p, form_str(RPL_ENDOFNAMES),
me.name, source_p->name, "*");
}
-
- return 0;
}
/*
static void
names_global(struct Client *source_p)
{
- int mlen;
- int tlen;
- int cur_len;
- int dont_show = NO;
- rb_dlink_node *lp, *ptr;
+ bool dont_show = false;
+ rb_dlink_node *ptr;
struct Client *target_p;
struct Channel *chptr = NULL;
- struct membership *msptr;
- char buf[BUFSIZE];
- char *t;
/* first do all visible channels */
RB_DLINK_FOREACH(ptr, global_channel_list.head)
chptr = ptr->data;
channel_member_names(chptr, source_p, 0);
}
- cur_len = mlen = rb_sprintf(buf, form_str(RPL_NAMREPLY),
- me.name, source_p->name, "*", "*");
- t = buf + mlen;
+
+ send_multiline_init(source_p, " ", form_str(RPL_NAMREPLY),
+ me.name,
+ source_p->name,
+ "*",
+ "*");
/* Second, do all clients in one big sweep */
RB_DLINK_FOREACH(ptr, global_client_list.head)
{
+ rb_dlink_node *ps, *pt;
+ struct membership *ms, *mt;
+
target_p = ptr->data;
- dont_show = NO;
+ dont_show = false;
if(!IsPerson(target_p) || IsInvisible(target_p))
continue;
* both were missed out above. if the target is on a
* common channel with source, its already been shown.
*/
- RB_DLINK_FOREACH(lp, target_p->user->channel.head)
+ ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr)
{
- msptr = lp->data;
- chptr = msptr->chptr;
+ if (!mt) continue;
- if(PubChannel(chptr) || IsMember(source_p, chptr) ||
- SecretChannel(chptr))
+ if (PubChannel(chptr) || SecretChannel(chptr) || ms)
{
- dont_show = YES;
+ dont_show = true;
break;
}
}
if(dont_show)
continue;
- if((cur_len + NICKLEN + 2) > (BUFSIZE - 3))
+ if (IsCapable(source_p, CLICAP_USERHOST_IN_NAMES))
{
- sendto_one(source_p, "%s", buf);
- cur_len = mlen;
- t = buf + mlen;
+ send_multiline_item(source_p, "%s!%s@%s",
+ target_p->name,
+ target_p->username,
+ target_p->host);
+ }
+ else
+ {
+ send_multiline_item(source_p, "%s", target_p->name);
}
-
- tlen = rb_sprintf(t, "%s ", target_p->name);
- cur_len += tlen;
- t += tlen;
}
- if(cur_len > mlen)
- sendto_one(source_p, "%s", buf);
+ send_multiline_fini(source_p, NULL);
}