cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] - rename m_list_safelist to m_list and remove ratbox implementation

This commit is contained in:
nenolod 2007-04-03 03:18:07 -07:00
parent e8a2d50da8
commit 607cf49f89
5 changed files with 16 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
nenolod 2007/04/03 10:15:39 UTC (20070403-3370)
Log:
- some more transit to sendto_one_numeric().
Changes: Modified:
+2 -3 trunk/modules/m_away.c (File Modified)
+3 -3 trunk/src/messages.tab (File Modified)
+1 -1 trunk/src/s_user.c (File Modified)
nenolod 2007/04/03 10:11:06 UTC (20070403-3368)
Log:
- change some sendto_one() to sendto_one_numeric().

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070403-3368"
#define SERNO "20070403-3370"

4
modules/Makefile.in
View File

@ -1,7 +1,7 @@
#
# Makefile.in for ircd/modules
#
# $Id: Makefile.in 946 2006-03-06 03:43:02Z nenolod $
# $Id: Makefile.in 3372 2007-04-03 10:18:07Z nenolod $
#
CC = @CC@
AR = @AR@
@ -72,7 +72,7 @@ TSRCS = \
m_kline.c \
m_knock.c \
m_links.c \
m_list_safelist.c \
m_list.c \
m_locops.c \
m_lusers.c \
m_map.c \

4
modules/m_list_safelist.c → modules/m_list.c
View File

@ -30,7 +30,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id: m_list_safelist.c 1393 2006-05-20 19:28:16Z jilles $
* $Id: m_list.c 3372 2007-04-03 10:18:07Z nenolod $
*/
#include "stdinc.h"
@ -77,7 +77,7 @@ mapi_hfn_list_av1 list_hfnlist[] = {
{NULL, NULL}
};
DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, "$Revision: 1393 $");
DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, "$Revision: 3372 $");
static int _modinit(void)
{

271
modules/m_list_ratbox.c
View File

@ -1,271 +0,0 @@
/*
* ircd-ratbox: A slightly useful ircd.
* m_list.c: Shows what servers are currently connected.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2005 ircd-ratbox development team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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_list_ratbox.c 722 2006-02-08 21:51:28Z nenolod $
*/
#include "stdinc.h"
#include "tools.h"
#include "channel.h"
#include "client.h"
#include "hash.h"
#include "irc_string.h"
#include "ircd.h"
#include "numeric.h"
#include "s_conf.h"
#include "s_serv.h"
#include "send.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
#include "linebuf.h"
static int m_list(struct Client *, struct Client *, int, const char **);
static int mo_list(struct Client *, struct Client *, int, const char **);
struct Message list_msgtab = {
"LIST", 0, 0, 0, MFLG_SLOW,
{mg_unreg, {m_list, 0}, mg_ignore, mg_ignore, mg_ignore, {mo_list, 0}}
};
mapi_clist_av1 list_clist[] = { &list_msgtab, NULL };
DECLARE_MODULE_AV1(list, NULL, NULL, list_clist, NULL, NULL, "$Revision: 722 $");
static void list_all_channels(struct Client *source_p);
static void list_limit_channels(struct Client *source_p, const char *param);
static void list_named_channel(struct Client *source_p, const char *name);
/* m_list()
* parv[0] = sender prefix
* parv[1] = channel
*/
static int
m_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static time_t last_used = 0L;
/* pace this due to the sheer traffic involved */
if(((last_used + ConfigFileEntry.pace_wait) > CurrentTime))
{
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "LIST");
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return 0;
}
else
last_used = CurrentTime;
/* If no arg, do all channels *whee*, else just one channel */
if(parc < 2 || EmptyString(parv[1]))
list_all_channels(source_p);
else if(IsChannelName(parv[1]))
list_named_channel(source_p, parv[1]);
else
list_limit_channels(source_p, parv[1]);
return 0;
}
/* mo_list()
* parv[0] = sender prefix
* parv[1] = channel
*/
static int
mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* If no arg, do all channels *whee*, else just one channel */
if(parc < 2 || EmptyString(parv[1]))
list_all_channels(source_p);
else if(IsChannelName(parv[1]))
list_named_channel(source_p, parv[1]);
else
list_limit_channels(source_p, parv[1]);
return 0;
}
/* list_all_channels()
*
* inputs - pointer to client requesting list
* output -
* side effects - list all channels to source_p
*/
static void
list_all_channels(struct Client *source_p)
{
struct Channel *chptr;
dlink_node *ptr;
int sendq_limit;
/* give them an output limit of 90% of their sendq. --fl */
sendq_limit = (int) get_sendq(source_p);
sendq_limit /= 10;
sendq_limit *= 9;
sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
DLINK_FOREACH(ptr, global_channel_list.head)
{
chptr = ptr->data;
/* if theyre overflowing their sendq, stop. --fl */
if(linebuf_len(&source_p->localClient->buf_sendq) > sendq_limit)
{
sendto_one(source_p, form_str(ERR_TOOMANYMATCHES),
me.name, source_p->name, "LIST");
break;
}
if(SecretChannel(chptr) && !IsMember(source_p, chptr))
continue;
sendto_one(source_p, form_str(RPL_LIST),
me.name, source_p->name, chptr->chname,
dlink_list_length(&chptr->members),
chptr->topic == NULL ? "" : chptr->topic);
}
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return;
}
static void
list_limit_channels(struct Client *source_p, const char *param)
{
struct Channel *chptr;
char *args;
char *p;
dlink_node *ptr;
unsigned int sendq_limit;
int max = INT_MAX;
int min = 0;
int i;
args = LOCAL_COPY(param);
for(i = 0; i < 2; i++)
{
if((p = strchr(args, ',')) != NULL)
*p++ = '\0';
if(*args == '<')
{
args++;
if((max = atoi(args)) <= 0)
max = INT_MAX;
}
else if(*args == '>')
{
args++;
if((min = atoi(args)) < 0)
min = 0;
}
if(EmptyString(p))
break;
else
args = p;
}
/* give them an output limit of 90% of their sendq. --fl */
sendq_limit = (unsigned int) get_sendq(source_p);
sendq_limit /= 10;
sendq_limit *= 9;
sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
DLINK_FOREACH(ptr, global_channel_list.head)
{
chptr = ptr->data;
/* if theyre overflowing their sendq, stop. --fl */
if(linebuf_len(&source_p->localClient->buf_sendq) > sendq_limit)
{
sendto_one(source_p, form_str(ERR_TOOMANYMATCHES),
me.name, source_p->name, "LIST");
break;
}
if(dlink_list_length(&chptr->members) >= max ||
dlink_list_length(&chptr->members) <= min)
continue;
if(SecretChannel(chptr) && !IsMember(source_p, chptr))
continue;
sendto_one(source_p, form_str(RPL_LIST),
me.name, source_p->name, chptr->chname,
dlink_list_length(&chptr->members),
chptr->topic == NULL ? "" : chptr->topic);
}
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return;
}
/* list_named_channel()
*
* inputs - pointer to client requesting list
* output -
* side effects - list single channel to source
*/
static void
list_named_channel(struct Client *source_p, const char *name)
{
struct Channel *chptr;
char *p;
char *n = LOCAL_COPY(name);
sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
if((p = strchr(n, ',')))
*p = '\0';
if(*n == '\0')
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), name);
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return;
}
chptr = find_channel(n);
if(chptr == NULL)
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), n);
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return;
}
if(ShowChannel(source_p, chptr))
sendto_one(source_p, form_str(RPL_LIST),
me.name, source_p->name, chptr->chname,
dlink_list_length(&chptr->members),
chptr->topic == NULL ? "" : chptr->topic);
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
return;
}