* note: it is guaranteed that parv[0]..parv[parc-1] are all
* non-NULL pointers.
*/
+#include "config.h"
+
#if 0
/*
* No need to include handlers.h here the signatures must match
#include <assert.h>
#include <string.h>
-#define NAMES_ALL 1 /* List all users in channel */
-#define NAMES_VIS 2 /* List only visible users in non-secret channels */
-
/*
* Sends a suitably formatted 'names' reply to 'sptr' consisting of nicks within
* 'chptr', depending on 'filter'.
*
* NAMES_ALL - Lists all users on channel.
* NAMES_VIS - Only list visible (-i) users. --Gte (04/06/2000).
+ * NAMES_EON - When OR'd with the other two, adds an 'End of Names' numeric
+ * used by m_join
*
*/
char buf[BUFSIZE];
struct Client *c2ptr;
struct Membership* member;
+
+ assert(chptr);
+ assert(sptr);
+ assert((filter&NAMES_ALL) != (filter&NAMES_VIS));
/* Tag Pub/Secret channels accordingly. */
/* Iterate over all channel members, and build up the list. */
- mlen = strlen(me.name) + 10 + strlen(sptr->name);
+ mlen = strlen(cli_name(&me)) + 10 + strlen(cli_name(sptr));
for (member = chptr->members; member; member = member->next_member)
{
c2ptr = member->user;
- if ((filter == NAMES_VIS) && IsInvisible(c2ptr))
+ if (((filter&NAMES_VIS)!=0) && IsInvisible(c2ptr))
+ continue;
+
+ if (IsZombie(member) && member->user != sptr)
continue;
if (needs_space) {
needs_space=1;
if (IsZombie(member))
{
- if (member->user != sptr)
- continue;
- else
- {
- strcat(buf, "!");
- idx++;
- }
+ strcat(buf, "!");
+ idx++;
}
else if (IsChanOp(member))
{
strcat(buf, "+");
idx++;
}
- strcat(buf, c2ptr->name);
- idx += strlen(c2ptr->name) + 1;
+ strcat(buf, cli_name(c2ptr));
+ idx += strlen(cli_name(c2ptr)) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 5 > BUFSIZE)
/* space, modifier, nick, \r \n \0 */
- {
+ {
send_reply(sptr, RPL_NAMREPLY, buf);
strcpy(buf, "* ");
ircd_strncpy(buf + 2, chptr->chname, len + 1);
}
if (flag)
send_reply(sptr, RPL_NAMREPLY, buf);
+ if (filter&NAMES_EON)
+ send_reply(sptr, RPL_ENDOFNAMES, chptr->chname);
}
/*
char* s;
char* para = parc > 1 ? parv[1] : 0;
- if (parc > 2 && hunt_server_cmd(sptr, CMD_NAMES, cptr, 1, "%s %C", 2, parc,
- parv))
+ if (parc > 2 && hunt_server_cmd(sptr, CMD_NAMES, cptr, 1, "%s %C", 2, parc, parv))
return 0;
- if (EmptyString(para))
+ if (EmptyString(para)) {
+ send_reply(sptr, RPL_ENDOFNAMES, "*");
return 0;
+ }
else if (*para == '0')
*para = '\0';
- s = strchr(para, ','); /* Recursively call m_names for each comma-seperated channel. */
+ s = strchr(para, ','); /* Recursively call m_names for each comma-seperated channel. Eww. */
if (s) {
parv[1] = ++s;
m_names(cptr, sptr, parc, parv);
struct Channel *ch3ptr;
char buf[BUFSIZE];
- mlen = strlen(me.name) + 10 + strlen(sptr->name);
+ mlen = strlen(cli_name(&me)) + 10 + strlen(cli_name(sptr));
/* List all visible channels/visible members */
idx = 5;
flag = 0;
- for (c2ptr = GlobalClientList; c2ptr; c2ptr = c2ptr->next)
+ for (c2ptr = GlobalClientList; c2ptr; c2ptr = cli_next(c2ptr))
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
- member = c2ptr->user->channel;
+ member = cli_user(c2ptr)->channel;
while (member)
{
if (showflag) /* Have we already shown them? */
continue;
- strcat(buf, c2ptr->name);
+ strcat(buf, cli_name(c2ptr));
strcat(buf, " ");
- idx += strlen(c2ptr->name) + 1;
+ idx += strlen(cli_name(c2ptr)) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */
clean_channelname(para);
chptr = FindChannel(para);
-
- member = find_member_link(chptr, sptr);
- if (member)
- {
- if (chptr) do_names(sptr, chptr, NAMES_ALL);
- if (!EmptyString(para))
- {
- send_reply(sptr, RPL_ENDOFNAMES, chptr ? chptr->chname : para);
- return 1;
- }
- }
- else
- {
- /*
- * Special Case 3: User isn't on this channel, show all visible users, in
- * non secret channels.
- */
-
- if (chptr) do_names(sptr, chptr, NAMES_VIS);
- if (!EmptyString(para))
- {
- send_reply(sptr, RPL_ENDOFNAMES, para);
- return 1;
+ if (chptr) {
+ member = find_member_link(chptr, sptr);
+ if (member)
+ {
+ do_names(sptr, chptr, NAMES_ALL);
+ if (!EmptyString(para))
+ {
+ send_reply(sptr, RPL_ENDOFNAMES, chptr ? chptr->chname : para);
+ return 1;
+ }
}
- }
+ else
+ {
+ /*
+ * Special Case 3: User isn't on this channel, show all visible users, in
+ * non secret channels.
+ */
+ do_names(sptr, chptr, NAMES_VIS);
+ }
+ } else { /* Channel doesn't exist. */
+ send_reply(sptr, RPL_ENDOFNAMES, para);
+ }
+ return 1;
}
char* s;
char* para = parc > 1 ? parv[1] : 0;
- if (parc > 2 && hunt_server_cmd(sptr, CMD_NAMES, cptr, 1, "%s %C", 2, parc,
- parv))
+ if (parc > 2 && hunt_server_cmd(sptr, CMD_NAMES, cptr, 1, "%s %C", 2, parc, parv))
return 0;
- if (EmptyString(para))
+ if (EmptyString(para)) {
+ send_reply(sptr, RPL_ENDOFNAMES, "*");
return 0;
+ }
else if (*para == '0')
*para = '\0';
struct Channel *ch3ptr;
char buf[BUFSIZE];
- mlen = strlen(me.name) + 10 + strlen(sptr->name);
+ mlen = strlen(cli_name(&me)) + 10 + strlen(cli_name(sptr));
/* List all visible channels/visible members */
idx = 5;
flag = 0;
- for (c2ptr = GlobalClientList; c2ptr; c2ptr = c2ptr->next)
+ for (c2ptr = GlobalClientList; c2ptr; c2ptr = cli_next(c2ptr))
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
- member = c2ptr->user->channel;
+ member = cli_user(c2ptr)->channel;
while (member)
{
if (showflag) /* Have we already shown them? */
continue;
- strcat(buf, c2ptr->name);
+ strcat(buf, cli_name(c2ptr));
strcat(buf, " ");
- idx += strlen(c2ptr->name) + 1;
+ idx += strlen(cli_name(c2ptr)) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */
clean_channelname(para);
chptr = FindChannel(para);
-
- member = find_member_link(chptr, sptr);
- if (member)
- {
- if (chptr) do_names(sptr, chptr, NAMES_ALL);
- if (!EmptyString(para))
- {
- send_reply(sptr, RPL_ENDOFNAMES, chptr ? chptr->chname : para);
- return 1;
- }
- }
- else
- {
- /*
- * Special Case 3: User isn't on this channel, show all visible users, in
- * non secret channels.
- */
-
- if (chptr) do_names(sptr, chptr, NAMES_VIS);
- if (!EmptyString(para))
- {
- send_reply(sptr, RPL_ENDOFNAMES, para);
- return 1;
+ if (chptr) {
+ member = find_member_link(chptr, sptr);
+ if (member)
+ {
+ do_names(sptr, chptr, NAMES_ALL);
+ if (!EmptyString(para))
+ {
+ send_reply(sptr, RPL_ENDOFNAMES, chptr ? chptr->chname : para);
+ return 1;
+ }
}
- }
+ else
+ {
+ /*
+ * Special Case 3: User isn't on this channel, show all visible users, in
+ * non secret channels.
+ */
+ do_names(sptr, chptr, NAMES_VIS);
+ }
+ } else { /* Channel doesn't exist. */
+ send_reply(sptr, RPL_ENDOFNAMES, para);
+ }
+ return 1;
}