start making this compile

This commit is contained in:
William Pitcock 2008-04-01 15:18:48 -05:00
parent d56734d6dd
commit 5b96d9a6b9
60 changed files with 1834 additions and 2071 deletions

View file

@ -23,7 +23,7 @@ SSL_INCLUDES = @SSL_INCLUDES@
IRCDLIBS = @LIBS@ $(SSL_LIBS) IRCDLIBS = @LIBS@ $(SSL_LIBS)
INCLUDES = -I. -I../include -I../libcharybdis -I../adns $(SSL_INCLUDES) INCLUDES = -I. -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
CPPFLAGS = ${INCLUDES} @CPPFLAGS@ CPPFLAGS = ${INCLUDES} @CPPFLAGS@
SRCS = \ SRCS = \

View file

@ -40,7 +40,7 @@ struct BlacklistClient {
struct Blacklist *blacklist; struct Blacklist *blacklist;
struct Client *client_p; struct Client *client_p;
struct DNSQuery dns_query; struct DNSQuery dns_query;
dlink_node node; rb_dlink_node node;
}; };
/* public interfaces */ /* public interfaces */
@ -50,6 +50,6 @@ void abort_blacklist_queries(struct Client *client_p);
void unref_blacklist(struct Blacklist *blptr); void unref_blacklist(struct Blacklist *blptr);
void destroy_blacklists(void); void destroy_blacklists(void);
extern dlink_list blacklist_list; extern rb_dlink_list blacklist_list;
#endif #endif

View file

@ -18,14 +18,14 @@ struct Client;
struct cachefile struct cachefile
{ {
char name[CACHEFILELEN]; char name[CACHEFILELEN];
dlink_list contents; rb_dlink_list contents;
int flags; int flags;
}; };
struct cacheline struct cacheline
{ {
char data[CACHELINELEN]; char data[CACHELINELEN];
dlink_node linenode; rb_dlink_node linenode;
}; };
extern struct cachefile *user_motd; extern struct cachefile *user_motd;

View file

@ -51,7 +51,7 @@ struct Mode
/* channel structure */ /* channel structure */
struct Channel struct Channel
{ {
dlink_node node; rb_dlink_node node;
struct Mode mode; struct Mode mode;
char *topic; char *topic;
char *topic_info; char *topic_info;
@ -59,14 +59,14 @@ struct Channel
time_t users_last; /* when last user was in channel */ time_t users_last; /* when last user was in channel */
time_t last_knock; /* don't allow knock to flood */ time_t last_knock; /* don't allow knock to flood */
dlink_list members; /* channel members */ rb_dlink_list members; /* channel members */
dlink_list locmembers; /* local channel members */ rb_dlink_list locmembers; /* local channel members */
dlink_list invites; rb_dlink_list invites;
dlink_list banlist; rb_dlink_list banlist;
dlink_list exceptlist; rb_dlink_list exceptlist;
dlink_list invexlist; rb_dlink_list invexlist;
dlink_list quietlist; rb_dlink_list quietlist;
time_t first_received_message_time; /* channel flood control */ time_t first_received_message_time; /* channel flood control */
int received_number_of_privmsgs; int received_number_of_privmsgs;
@ -82,9 +82,9 @@ struct Channel
struct membership struct membership
{ {
dlink_node channode; rb_dlink_node channode;
dlink_node locchannode; rb_dlink_node locchannode;
dlink_node usernode; rb_dlink_node usernode;
struct Channel *chptr; struct Channel *chptr;
struct Client *client_p; struct Client *client_p;
@ -99,7 +99,7 @@ struct Ban
char *banstr; char *banstr;
char *who; char *who;
time_t when; time_t when;
dlink_node node; rb_dlink_node node;
}; };
struct mode_letter struct mode_letter
@ -203,7 +203,7 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
#define EXTBAN_NOMATCH 0 /* valid mask, no match */ #define EXTBAN_NOMATCH 0 /* valid mask, no match */
#define EXTBAN_MATCH 1 /* matches */ #define EXTBAN_MATCH 1 /* matches */
extern dlink_list global_channel_list; extern rb_dlink_list global_channel_list;
void init_channels(void); void init_channels(void);
struct Channel *allocate_channel(const char *chname); struct Channel *allocate_channel(const char *chname);
@ -229,7 +229,7 @@ extern void remove_user_from_channel(struct membership *);
extern void remove_user_from_channels(struct Client *); extern void remove_user_from_channels(struct Client *);
extern void invalidate_bancache_user(struct Client *); extern void invalidate_bancache_user(struct Client *);
extern void free_channel_list(dlink_list *); extern void free_channel_list(rb_dlink_list *);
extern int check_channel_name(const char *name); extern int check_channel_name(const char *name);
@ -263,9 +263,9 @@ extern const struct mode_letter chmode_flags[];
extern struct ChannelMode chmode_table[256]; extern struct ChannelMode chmode_table[256];
extern int add_id(struct Client *source_p, struct Channel *chptr, const char *banid, extern int add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
dlink_list * list, long mode_type); rb_dlink_list * list, long mode_type);
extern int del_id(struct Channel *chptr, const char *banid, dlink_list * list, long mode_type); extern int del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list, long mode_type);
extern ExtbanFunc extban_table[256]; extern ExtbanFunc extban_table[256];

View file

@ -51,7 +51,7 @@ struct Class
}; };
extern dlink_list class_list; extern rb_dlink_list class_list;
extern struct Class *default_class; extern struct Class *default_class;
#define ClassName(x) ((x)->class_name) #define ClassName(x) ((x)->class_name)

View file

@ -92,8 +92,8 @@ typedef struct ListClient list_client_t;
*/ */
struct User struct User
{ {
dlink_list channel; /* chain of channel pointer blocks */ rb_dlink_list channel; /* chain of channel pointer blocks */
dlink_list invited; /* chain of invite pointer blocks */ rb_dlink_list invited; /* chain of invite pointer blocks */
char *away; /* pointer to away message */ char *away; /* pointer to away message */
int refcnt; /* Number of times this block is referenced */ int refcnt; /* Number of times this block is referenced */
@ -104,8 +104,8 @@ struct Server
{ {
user_t *user; /* who activated this connection */ user_t *user; /* who activated this connection */
char by[NICKLEN]; char by[NICKLEN];
dlink_list servers; rb_dlink_list servers;
dlink_list users; rb_dlink_list users;
int caps; /* capabilities bit-field */ int caps; /* capabilities bit-field */
char *fullcaps; char *fullcaps;
struct scache_entry *nameinfo; struct scache_entry *nameinfo;
@ -136,8 +136,8 @@ struct ZipStats
struct Client struct Client
{ {
dlink_node node; rb_dlink_node node;
dlink_node lnode; rb_dlink_node lnode;
user_t *user; /* ...defined, if this is a User */ user_t *user; /* ...defined, if this is a User */
server_t *serv; /* ...defined, if this is a server */ server_t *serv; /* ...defined, if this is a server */
client_t *servptr; /* Points to server this Client is on */ client_t *servptr; /* Points to server this Client is on */
@ -182,7 +182,7 @@ struct Client
/* list of who has this client on their allow list, its counterpart /* list of who has this client on their allow list, its counterpart
* is in LocalUser * is in LocalUser
*/ */
dlink_list on_allow_list; rb_dlink_list on_allow_list;
local_user_t *localClient; local_user_t *localClient;
pre_client_t *preClient; pre_client_t *preClient;
@ -190,7 +190,7 @@ struct Client
struct LocalUser struct LocalUser
{ {
dlink_node tnode; /* This is the node for the local list type the client is on*/ rb_dlink_node tnode; /* This is the node for the local list type the client is on*/
/* /*
* The following fields are allocated only for local clients * The following fields are allocated only for local clients
* (directly connected to *this* server with a socket. * (directly connected to *this* server with a socket.
@ -251,7 +251,7 @@ struct LocalUser
char *fullcaps; char *fullcaps;
int caps; /* capabilities bit-field */ int caps; /* capabilities bit-field */
fde_t *F; /* >= 0, for local clients */ rb_fde_t *F; /* >= 0, for local clients */
/* time challenge response is valid for */ /* time challenge response is valid for */
time_t chal_time; time_t chal_time;
@ -271,10 +271,10 @@ struct LocalUser
time_t last; time_t last;
/* clients allowed to talk through +g */ /* clients allowed to talk through +g */
dlink_list allow_list; rb_dlink_list allow_list;
/* nicknames theyre monitoring */ /* nicknames theyre monitoring */
dlink_list monitor_list; rb_dlink_list monitor_list;
/* /*
* Anti-flood stuff. We track how many messages were parsed and how * Anti-flood stuff. We track how many messages were parsed and how
@ -310,7 +310,7 @@ struct PreClient
unsigned char sasl_out; unsigned char sasl_out;
unsigned char sasl_complete; unsigned char sasl_complete;
dlink_list dnsbl_queries; /* list of struct BlacklistClient * */ rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */
struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */ struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */
}; };

View file

@ -31,12 +31,12 @@
struct Dictionary; struct Dictionary;
extern dlink_list *clientTable; extern rb_dlink_list *clientTable;
extern dlink_list *channelTable; extern rb_dlink_list *channelTable;
extern dlink_list *idTable; extern rb_dlink_list *idTable;
extern dlink_list *resvTable; extern rb_dlink_list *resvTable;
extern dlink_list *hostTable; extern rb_dlink_list *hostTable;
extern dlink_list *helpTable; extern rb_dlink_list *helpTable;
extern struct Dictionary *nd_dict; extern struct Dictionary *nd_dict;
@ -60,8 +60,8 @@ extern struct Dictionary *nd_dict;
#define R_MAX 1024 /* 2^10 */ #define R_MAX 1024 /* 2^10 */
#define HASH_WALK(i, max, ptr, table) for (i = 0; i < max; i++) { DLINK_FOREACH(ptr, table[i].head) #define HASH_WALK(i, max, ptr, table) for (i = 0; i < max; i++) { RB_DLINK_FOREACH(ptr, table[i].head)
#define HASH_WALK_SAFE(i, max, ptr, nptr, table) for (i = 0; i < max; i++) { DLINK_FOREACH_SAFE(ptr, nptr, table[i].head) #define HASH_WALK_SAFE(i, max, ptr, nptr, table) for (i = 0; i < max; i++) { RB_DLINK_FOREACH_SAFE(ptr, nptr, table[i].head)
#define HASH_WALK_END } #define HASH_WALK_END }
struct Client; struct Client;
@ -93,7 +93,7 @@ extern struct Channel *find_channel(const char *name);
extern void add_to_hostname_hash(const char *, struct Client *); extern void add_to_hostname_hash(const char *, struct Client *);
extern void del_from_hostname_hash(const char *, struct Client *); extern void del_from_hostname_hash(const char *, struct Client *);
extern dlink_node *find_hostname(const char *); extern rb_dlink_node *find_hostname(const char *);
extern void add_to_resv_hash(const char *name, struct ConfItem *aconf); extern void add_to_resv_hash(const char *name, struct ConfItem *aconf);
extern void del_from_resv_hash(const char *name, struct ConfItem *aconf); extern void del_from_resv_hash(const char *name, struct ConfItem *aconf);

View file

@ -10,7 +10,7 @@
typedef struct typedef struct
{ {
char *name; char *name;
dlink_list hooks; rb_dlink_list hooks;
} hook; } hook;
typedef void (*hookfn) (void *data); typedef void (*hookfn) (void *data);

View file

@ -32,7 +32,7 @@
#include "memory.h" #include "memory.h"
struct Client; struct Client;
struct dlink_list; struct rb_dlink_list;
struct SetOptions struct SetOptions
{ {
@ -79,7 +79,7 @@ extern int opers_see_all_users; /* sno_farconnect.so loaded, operspy without
accountability, etc */ accountability, etc */
extern struct Client me; extern struct Client me;
extern dlink_list global_client_list; extern rb_dlink_list global_client_list;
extern struct Client *local[]; extern struct Client *local[];
extern struct Counter Count; extern struct Counter Count;
#if 0 #if 0
@ -97,13 +97,13 @@ extern int split_users;
extern int split_servers; extern int split_servers;
int eob_count; int eob_count;
extern dlink_list unknown_list; extern rb_dlink_list unknown_list;
extern dlink_list lclient_list; extern rb_dlink_list lclient_list;
extern dlink_list serv_list; extern rb_dlink_list serv_list;
extern dlink_list global_serv_list; extern rb_dlink_list global_serv_list;
extern dlink_list local_oper_list; extern rb_dlink_list local_oper_list;
extern dlink_list oper_list; extern rb_dlink_list oper_list;
extern dlink_list dead_list; extern rb_dlink_list dead_list;
extern void get_current_bandwidth(struct Client *source_p, struct Client *target_p); extern void get_current_bandwidth(struct Client *source_p, struct Client *target_p);

View file

@ -14,7 +14,7 @@ struct monitor
{ {
struct monitor *hnext; struct monitor *hnext;
char name[NICKLEN]; char name[NICKLEN];
dlink_list users; rb_dlink_list users;
}; };
extern BlockHeap *monitor_heap; extern BlockHeap *monitor_heap;

View file

@ -27,7 +27,7 @@ struct TopConf
const char *tc_name; const char *tc_name;
int (*tc_sfunc) (struct TopConf *); int (*tc_sfunc) (struct TopConf *);
int (*tc_efunc) (struct TopConf *); int (*tc_efunc) (struct TopConf *);
dlink_list tc_items; rb_dlink_list tc_items;
struct ConfEntry *tc_entries; struct ConfEntry *tc_entries;
}; };

View file

@ -1,162 +0,0 @@
/*
* $Id: patricia.h 6 2005-09-10 01:02:21Z nenolod $
* Dave Plonka <plonka@doit.wisc.edu>
*
* This product includes software developed by the University of Michigan,
* Merit Network, Inc., and their contributors.
*
* This file had been called "radix.h" in the MRT sources.
*
* I renamed it to "patricia.h" since it's not an implementation of a general
* radix trie. Also, pulled in various requirements from "mrt.h" and added
* some other things it could be used as a standalone API.
*/
#ifndef _PATRICIA_H
#define _PATRICIA_H
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#ifndef TESTING
#include "class.h"
#include "client.h"
#include "common.h"
#include "irc_string.h"
#include "ircd.h"
#include "numeric.h"
#include "send.h"
#include "memory.h"
#include "config.h"
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE !(FALSE)
#endif
#ifndef INET6_ADDRSTRLEN
#define INET6_ADDRSTRLEN 46
#endif
/* typedef unsigned int u_int; */
typedef void (*void_fn_t) ();
#define prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin)
#define MAXLINE 1024
#define BIT_TEST(f, b) ((f) & (b))
#include <netinet/in.h>
#include <sys/socket.h>
typedef struct _prefix_t
{
u_short family; /* AF_INET | AF_INET6 */
u_short bitlen; /* same as mask? */
int ref_count; /* reference count */
union
{
struct in_addr sin;
#ifdef IPV6
struct in6_addr sin6;
#endif /* IPV6 */
}
add;
}
prefix_t;
typedef struct _patricia_node_t
{
u_int bit; /* flag if this node used */
prefix_t *prefix; /* who we are in patricia tree */
struct _patricia_node_t *l, *r; /* left and right children */
struct _patricia_node_t *parent; /* may be used */
void *data;
}
patricia_node_t;
typedef struct _patricia_tree_t
{
patricia_node_t *head;
u_int maxbits; /* for IP, 32 bit addresses */
int num_active_node; /* for debug purpose */
}
patricia_tree_t;
patricia_node_t *match_ip(patricia_tree_t * tree, struct sockaddr *ip);
patricia_node_t *match_string(patricia_tree_t * tree, const char *string);
patricia_node_t *match_exact_string(patricia_tree_t * tree, const char *string);
patricia_node_t *patricia_search_exact(patricia_tree_t * patricia, prefix_t * prefix);
patricia_node_t *patricia_search_best(patricia_tree_t * patricia, prefix_t * prefix);
patricia_node_t *patricia_search_best2(patricia_tree_t * patricia,
prefix_t * prefix, int inclusive);
patricia_node_t *patricia_lookup(patricia_tree_t * patricia, prefix_t * prefix);
void patricia_remove(patricia_tree_t * patricia, patricia_node_t * node);
patricia_tree_t *New_Patricia(int maxbits);
void Clear_Patricia(patricia_tree_t * patricia, void_fn_t func);
void Destroy_Patricia(patricia_tree_t * patricia, void_fn_t func);
void patricia_process(patricia_tree_t * patricia, void_fn_t func);
void init_patricia(void);
#if 0
prefix_t *ascii2prefix(int family, char *string);
#endif
patricia_node_t *make_and_lookup(patricia_tree_t * tree, const char *string);
patricia_node_t *make_and_lookup_ip(patricia_tree_t * tree, struct sockaddr *, int bitlen);
#define PATRICIA_MAXBITS 128
#define PATRICIA_NBIT(x) (0x80 >> ((x) & 0x7f))
#define PATRICIA_NBYTE(x) ((x) >> 3)
#define PATRICIA_DATA_GET(node, type) (type *)((node)->data)
#define PATRICIA_DATA_SET(node, value) ((node)->data = (void *)(value))
#define PATRICIA_WALK(Xhead, Xnode) \
do { \
patricia_node_t *Xstack[PATRICIA_MAXBITS+1]; \
patricia_node_t **Xsp = Xstack; \
patricia_node_t *Xrn = (Xhead); \
while ((Xnode = Xrn)) { \
if (Xnode->prefix)
#define PATRICIA_WALK_ALL(Xhead, Xnode) \
do { \
patricia_node_t *Xstack[PATRICIA_MAXBITS+1]; \
patricia_node_t **Xsp = Xstack; \
patricia_node_t *Xrn = (Xhead); \
while ((Xnode = Xrn)) { \
if (1)
#define PATRICIA_WALK_BREAK { \
if (Xsp != Xstack) { \
Xrn = *(--Xsp); \
} else { \
Xrn = (patricia_node_t *) 0; \
} \
continue; }
#define PATRICIA_WALK_END \
if (Xrn->l) { \
if (Xrn->r) { \
*Xsp++ = Xrn->r; \
} \
Xrn = Xrn->l; \
} else if (Xrn->r) { \
Xrn = Xrn->r; \
} else if (Xsp != Xstack) { \
Xrn = *(--Xsp); \
} else { \
Xrn = (patricia_node_t *) 0; \
} \
} \
} while (0)
#endif /* _PATRICIA_H */

View file

@ -29,7 +29,7 @@
/* amount of time to delay a rejected clients exit */ /* amount of time to delay a rejected clients exit */
#define DELAYED_EXIT_TIME 10 #define DELAYED_EXIT_TIME 10
extern dlink_list delay_exit; extern rb_dlink_list delay_exit;
void init_reject(void); void init_reject(void);
int check_reject(struct Client *); int check_reject(struct Client *);

View file

@ -41,7 +41,7 @@ struct Client;
struct AuthRequest struct AuthRequest
{ {
dlink_node node; rb_dlink_node node;
struct Client *client; /* pointer to client struct for request */ struct Client *client; /* pointer to client struct for request */
struct DNSQuery dns_query; /* DNS Query */ struct DNSQuery dns_query; /* DNS Query */
unsigned int flags; /* current state of request */ unsigned int flags; /* current state of request */

View file

@ -36,7 +36,6 @@
#include "class.h" #include "class.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "patricia.h"
struct Client; struct Client;
struct DNSReply; struct DNSReply;
@ -70,7 +69,7 @@ struct ConfItem
time_t hold; /* Hold action until this time (calendar time) */ time_t hold; /* Hold action until this time (calendar time) */
char *className; /* Name of class */ char *className; /* Name of class */
struct Class *c_class; /* Class of connection */ struct Class *c_class; /* Class of connection */
patricia_node_t *pnode; /* Our patricia node */ rb_patricia_node_t *pnode; /* Our patricia node */
}; };
#define CONF_ILLEGAL 0x80000000 #define CONF_ILLEGAL 0x80000000
@ -308,7 +307,7 @@ extern struct server_info ServerInfo; /* defined in ircd.c */
extern struct admin_info AdminInfo; /* defined in ircd.c */ extern struct admin_info AdminInfo; /* defined in ircd.c */
/* End GLOBAL section */ /* End GLOBAL section */
dlink_list service_list; rb_dlink_list service_list;
typedef enum temp_list typedef enum temp_list
{ {
@ -319,8 +318,8 @@ typedef enum temp_list
LAST_TEMP_TYPE LAST_TEMP_TYPE
} temp_list; } temp_list;
dlink_list temp_klines[LAST_TEMP_TYPE]; rb_dlink_list temp_klines[LAST_TEMP_TYPE];
dlink_list temp_dlines[LAST_TEMP_TYPE]; rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
extern void init_s_conf(void); extern void init_s_conf(void);
@ -359,7 +358,7 @@ extern void write_confitem(KlineType, struct Client *, char *, char *,
extern void add_temp_kline(struct ConfItem *); extern void add_temp_kline(struct ConfItem *);
extern void add_temp_dline(struct ConfItem *); extern void add_temp_dline(struct ConfItem *);
extern void report_temp_klines(struct Client *); extern void report_temp_klines(struct Client *);
extern void show_temp_klines(struct Client *, dlink_list *); extern void show_temp_klines(struct Client *, rb_dlink_list *);
extern const char *get_conf_name(KlineType); extern const char *get_conf_name(KlineType);
extern int rehash(int); extern int rehash(int);

View file

@ -67,7 +67,7 @@ gline_pending_t;
#define GLINE_PENDING_EXPIRE 600 #define GLINE_PENDING_EXPIRE 600
#define CLEANUP_GLINES_TIME 300 #define CLEANUP_GLINES_TIME 300
dlink_list pending_glines; rb_dlink_list pending_glines;
extern dlink_list glines; extern rb_dlink_list glines;
#endif #endif

View file

@ -44,15 +44,15 @@
struct ConfItem; struct ConfItem;
extern dlink_list cluster_conf_list; extern rb_dlink_list cluster_conf_list;
extern dlink_list shared_conf_list; extern rb_dlink_list shared_conf_list;
extern dlink_list oper_conf_list; extern rb_dlink_list oper_conf_list;
extern dlink_list hubleaf_conf_list; extern rb_dlink_list hubleaf_conf_list;
extern dlink_list server_conf_list; extern rb_dlink_list server_conf_list;
extern dlink_list xline_conf_list; extern rb_dlink_list xline_conf_list;
extern dlink_list resv_conf_list; extern rb_dlink_list resv_conf_list;
extern dlink_list nd_list; extern rb_dlink_list nd_list;
extern dlink_list tgchange_list; extern rb_dlink_list tgchange_list;
struct _patricia_tree_t *tgchange_tree; struct _patricia_tree_t *tgchange_tree;
@ -67,8 +67,8 @@ typedef struct
{ {
char *ip; char *ip;
time_t expiry; time_t expiry;
patricia_node_t *pnode; rb_patricia_node_t *pnode;
dlink_node node; rb_dlink_node node;
} tgchange; } tgchange;
void add_tgchange(const char *host); void add_tgchange(const char *host);
@ -81,7 +81,7 @@ struct remote_conf
char *host; char *host;
char *server; char *server;
int flags; int flags;
dlink_node node; rb_dlink_node node;
}; };
/* flags used in shared/cluster */ /* flags used in shared/cluster */
@ -208,7 +208,7 @@ struct server_conf
char *class_name; char *class_name;
struct Class *class; struct Class *class;
dlink_node node; rb_dlink_node node;
}; };
#define SERVER_ILLEGAL 0x0001 #define SERVER_ILLEGAL 0x0001
@ -251,7 +251,7 @@ struct nd_entry
{ {
char name[NICKLEN+1]; char name[NICKLEN+1];
time_t expire; time_t expire;
dlink_node lnode; /* node in ll */ rb_dlink_node lnode; /* node in ll */
}; };
extern void add_nd_entry(const char *name); extern void add_nd_entry(const char *name);

View file

@ -27,12 +27,12 @@
#ifndef INCLUDED_send_h #ifndef INCLUDED_send_h
#define INCLUDED_send_h #define INCLUDED_send_h
#include "ratbox_lib.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "config.h" /* HAVE_STDARG_H */ #include "config.h" /* HAVE_STDARG_H */
struct Client; struct Client;
struct Channel; struct Channel;
struct dlink_list;
struct monitor; struct monitor;
/* The nasty global also used in s_serv.c for server bursts */ /* The nasty global also used in s_serv.c for server bursts */

View file

@ -39,8 +39,8 @@
#ifndef SUBSTITUTION_H #ifndef SUBSTITUTION_H
#define SUBSTITUTION_H #define SUBSTITUTION_H
extern void substitution_append_var(dlink_list *varlist, const char *name, const char *value); extern void substitution_append_var(rb_dlink_list *varlist, const char *name, const char *value);
extern void substitution_free(dlink_list *varlist); extern void substitution_free(rb_dlink_list *varlist);
extern char *substitution_parse(const char *fmt, dlink_list *varlist); extern char *substitution_parse(const char *fmt, rb_dlink_list *varlist);
#endif #endif

View file

@ -24,8 +24,8 @@
* $Id: tools.h 3201 2007-02-04 01:59:38Z jilles $ * $Id: tools.h 3201 2007-02-04 01:59:38Z jilles $
*/ */
#ifndef __TOOLS_H__ #ifndef __LIBCHARYBDIS_TOOLS_H__
#define __TOOLS_H__ #define __LIBCHARYBDIS_TOOLS_H__
/* /*

File diff suppressed because it is too large Load diff

View file

@ -57,7 +57,7 @@ static int
mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
if(!IsOperDie(source_p)) if(!IsOperDie(source_p))
{ {
@ -76,14 +76,14 @@ mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, cons
return 0; return 0;
} }
DLINK_FOREACH(ptr, lclient_list.head) RB_DLINK_FOREACH(ptr, lclient_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
sendto_one_notice(target_p, ":Server Terminating. %s", get_client_name(source_p, HIDE_IP)); sendto_one_notice(target_p, ":Server Terminating. %s", get_client_name(source_p, HIDE_IP));
} }
DLINK_FOREACH(ptr, serv_list.head) RB_DLINK_FOREACH(ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -254,10 +254,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
flags = CHFL_CHANOP; flags = CHFL_CHANOP;
} }
if((dlink_list_length(&source_p->user->channel) >= if((rb_dlink_list_length(&source_p->user->channel) >=
(unsigned long) ConfigChannel.max_chans_per_user) && (unsigned long) ConfigChannel.max_chans_per_user) &&
(!IsOper(source_p) || (!IsOper(source_p) ||
(dlink_list_length(&source_p->user->channel) >= (rb_dlink_list_length(&source_p->user->channel) >=
(unsigned long) ConfigChannel.max_chans_per_user * 3))) (unsigned long) ConfigChannel.max_chans_per_user * 3)))
{ {
sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
@ -400,7 +400,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
int isnew; int isnew;
int keep_our_modes = YES; int keep_our_modes = YES;
int keep_new_modes = YES; int keep_new_modes = YES;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
/* special case for join 0 */ /* special case for join 0 */
if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2) if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2)
@ -470,7 +470,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
set_final_mode(&mode, &chptr->mode); set_final_mode(&mode, &chptr->mode);
chptr->mode = mode; chptr->mode = mode;
remove_our_modes(chptr, source_p); remove_our_modes(chptr, source_p);
DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
{ {
del_invite(chptr, ptr->data); del_invite(chptr, ptr->data);
} }
@ -532,7 +532,7 @@ do_join_0(struct Client *client_p, struct Client *source_p)
{ {
struct membership *msptr; struct membership *msptr;
struct Channel *chptr = NULL; struct Channel *chptr = NULL;
dlink_node *ptr; rb_dlink_node *ptr;
/* Finish the flood grace period... */ /* Finish the flood grace period... */
if(MyClient(source_p) && !IsFloodDone(source_p)) if(MyClient(source_p) && !IsFloodDone(source_p))
@ -716,7 +716,7 @@ static void
remove_our_modes(struct Channel *chptr, struct Client *source_p) remove_our_modes(struct Channel *chptr, struct Client *source_p)
{ {
struct membership *msptr; struct membership *msptr;
dlink_node *ptr; rb_dlink_node *ptr;
char lmodebuf[MODEBUFLEN]; char lmodebuf[MODEBUFLEN];
char *lpara[MAXMODEPARAMS]; char *lpara[MAXMODEPARAMS];
int count = 0; int count = 0;
@ -728,7 +728,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
for(i = 0; i < MAXMODEPARAMS; i++) for(i = 0; i < MAXMODEPARAMS; i++)
lpara[i] = NULL; lpara[i] = NULL;
DLINK_FOREACH(ptr, chptr->members.head) RB_DLINK_FOREACH(ptr, chptr->members.head)
{ {
msptr = ptr->data; msptr = ptr->data;

View file

@ -284,7 +284,7 @@ relay_kill(struct Client *one, struct Client *source_p,
struct Client *target_p, const char *inpath, const char *reason) struct Client *target_p, const char *inpath, const char *reason)
{ {
struct Client *client_p; struct Client *client_p;
dlink_node *ptr; rb_dlink_node *ptr;
char buffer[BUFSIZE]; char buffer[BUFSIZE];
if(MyClient(source_p)) if(MyClient(source_p))
@ -294,7 +294,7 @@ relay_kill(struct Client *one, struct Client *source_p,
else else
ircsnprintf(buffer, sizeof(buffer), "%s %s", inpath, reason); ircsnprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
DLINK_FOREACH(ptr, serv_list.head) RB_DLINK_FOREACH(ptr, serv_list.head)
{ {
client_p = ptr->data; client_p = ptr->data;

View file

@ -546,9 +546,9 @@ static void
expire_tgchange(void *unused) expire_tgchange(void *unused)
{ {
tgchange *target; tgchange *target;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
DLINK_FOREACH_SAFE(ptr, next_ptr, tgchange_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, tgchange_list.head)
{ {
target = ptr->data; target = ptr->data;
@ -1024,11 +1024,11 @@ find_userhost(const char *user, const char *host, int *count)
struct Client *c2ptr; struct Client *c2ptr;
struct Client *res = NULL; struct Client *res = NULL;
char *u = LOCAL_COPY(user); char *u = LOCAL_COPY(user);
dlink_node *ptr; rb_dlink_node *ptr;
*count = 0; *count = 0;
if(collapse(u) != NULL) if(collapse(u) != NULL)
{ {
DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
c2ptr = ptr->data; c2ptr = ptr->data;
if(!MyClient(c2ptr)) /* implies mine and an user */ if(!MyClient(c2ptr)) /* implies mine and an user */

View file

@ -214,7 +214,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
static char modebuf[BUFSIZE]; static char modebuf[BUFSIZE];
static char parabuf[BUFSIZE]; static char parabuf[BUFSIZE];
struct Channel *chptr; struct Channel *chptr;
dlink_list *banlist; rb_dlink_list *banlist;
const char *s; const char *s;
char *t; char *t;
char *mbuf; char *mbuf;

View file

@ -758,7 +758,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
char *nick, int dosend) char *nick, int dosend)
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
struct Channel *chptr; struct Channel *chptr;
int samenick; int samenick;
@ -841,7 +841,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
* to clear a clients own list of accepted clients. So just remove * to clear a clients own list of accepted clients. So just remove
* them from everyone elses list --anfl * them from everyone elses list --anfl
*/ */
DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -1240,9 +1240,9 @@ register_client(struct Client *client_p, struct Client *server,
if(flag & UMODE_SERVICE) if(flag & UMODE_SERVICE)
{ {
int hit = 0; int hit = 0;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, service_list.head) RB_DLINK_FOREACH(ptr, service_list.head)
{ {
if(!irccmp((const char *) ptr->data, server->name)) if(!irccmp((const char *) ptr->data, server->name))
{ {

View file

@ -250,7 +250,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
int hop; int hop;
int hlined = 0; int hlined = 0;
int llined = 0; int llined = 0;
dlink_node *ptr; rb_dlink_node *ptr;
name = parv[1]; name = parv[1];
hop = atoi(parv[2]); hop = atoi(parv[2]);
@ -333,7 +333,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
* leaf. If so, close the link. * leaf. If so, close the link.
* *
*/ */
DLINK_FOREACH(ptr, hubleaf_conf_list.head) RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
{ {
hub_p = ptr->data; hub_p = ptr->data;
@ -453,7 +453,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
struct Client *target_p; struct Client *target_p;
struct remote_conf *hub_p; struct remote_conf *hub_p;
hook_data_client hdata; hook_data_client hdata;
dlink_node *ptr; rb_dlink_node *ptr;
int hop; int hop;
int hlined = 0; int hlined = 0;
int llined = 0; int llined = 0;
@ -519,7 +519,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
* H: allows it to introduce a server matching that mask * H: allows it to introduce a server matching that mask
* L: disallows it introducing a server matching that mask * L: disallows it introducing a server matching that mask
*/ */
DLINK_FOREACH(ptr, hubleaf_conf_list.head) RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
{ {
hub_p = ptr->data; hub_p = ptr->data;

View file

@ -75,7 +75,7 @@ static int pargs;
static void set_final_mode(struct Mode *mode, struct Mode *oldmode); static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
static void remove_our_modes(struct Channel *chptr, struct Client *source_p); static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
static void remove_ban_list(struct Channel *chptr, struct Client *source_p, static void remove_ban_list(struct Channel *chptr, struct Client *source_p,
dlink_list * list, char c, int cap, int mems); rb_dlink_list * list, char c, int cap, int mems);
static int static int
ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@ -105,7 +105,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
char *p; char *p;
int i, joinc = 0, timeslice = 0; int i, joinc = 0, timeslice = 0;
static char empty[] = ""; static char empty[] = "";
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
if(!IsChannelName(parv[2]) || !check_channel_name(parv[2])) if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
return 0; return 0;
@ -263,13 +263,13 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
{ {
struct membership *msptr; struct membership *msptr;
struct Client *who; struct Client *who;
int l = dlink_list_length(&chptr->members); int l = rb_dlink_list_length(&chptr->members);
int b = dlink_list_length(&chptr->banlist) + int b = rb_dlink_list_length(&chptr->banlist) +
dlink_list_length(&chptr->exceptlist) + rb_dlink_list_length(&chptr->exceptlist) +
dlink_list_length(&chptr->invexlist) + rb_dlink_list_length(&chptr->invexlist) +
dlink_list_length(&chptr->quietlist); rb_dlink_list_length(&chptr->quietlist);
DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{ {
msptr = ptr->data; msptr = ptr->data;
who = msptr->client_p; who = msptr->client_p;
@ -343,7 +343,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
if(!keep_our_modes) if(!keep_our_modes)
{ {
remove_our_modes(chptr, fakesource_p); remove_our_modes(chptr, fakesource_p);
DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
{ {
del_invite(chptr, ptr->data); del_invite(chptr, ptr->data);
} }
@ -577,18 +577,18 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
*/ */
if(!keep_our_modes && source_p->id[0] != '\0') if(!keep_our_modes && source_p->id[0] != '\0')
{ {
if(dlink_list_length(&chptr->banlist) > 0) if(rb_dlink_list_length(&chptr->banlist) > 0)
remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', NOCAPS, ALL_MEMBERS); remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', NOCAPS, ALL_MEMBERS);
if(dlink_list_length(&chptr->exceptlist) > 0) if(rb_dlink_list_length(&chptr->exceptlist) > 0)
remove_ban_list(chptr, fakesource_p, &chptr->exceptlist, remove_ban_list(chptr, fakesource_p, &chptr->exceptlist,
'e', CAP_EX, ONLY_CHANOPS); 'e', CAP_EX, ONLY_CHANOPS);
if(dlink_list_length(&chptr->invexlist) > 0) if(rb_dlink_list_length(&chptr->invexlist) > 0)
remove_ban_list(chptr, fakesource_p, &chptr->invexlist, remove_ban_list(chptr, fakesource_p, &chptr->invexlist,
'I', CAP_IE, ONLY_CHANOPS); 'I', CAP_IE, ONLY_CHANOPS);
if(dlink_list_length(&chptr->quietlist) > 0) if(rb_dlink_list_length(&chptr->quietlist) > 0)
remove_ban_list(chptr, fakesource_p, &chptr->quietlist, remove_ban_list(chptr, fakesource_p, &chptr->quietlist,
'q', NOCAPS, ALL_MEMBERS); 'q', NOCAPS, ALL_MEMBERS);
@ -735,7 +735,7 @@ static void
remove_our_modes(struct Channel *chptr, struct Client *source_p) remove_our_modes(struct Channel *chptr, struct Client *source_p)
{ {
struct membership *msptr; struct membership *msptr;
dlink_node *ptr; rb_dlink_node *ptr;
char lmodebuf[MODEBUFLEN]; char lmodebuf[MODEBUFLEN];
char *lpara[MAXMODEPARAMS]; char *lpara[MAXMODEPARAMS];
int count = 0; int count = 0;
@ -747,7 +747,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
for (i = 0; i < MAXMODEPARAMS; i++) for (i = 0; i < MAXMODEPARAMS; i++)
lpara[i] = NULL; lpara[i] = NULL;
DLINK_FOREACH(ptr, chptr->members.head) RB_DLINK_FOREACH(ptr, chptr->members.head)
{ {
msptr = ptr->data; msptr = ptr->data;
@ -831,13 +831,13 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
*/ */
static void static void
remove_ban_list(struct Channel *chptr, struct Client *source_p, remove_ban_list(struct Channel *chptr, struct Client *source_p,
dlink_list * list, char c, int cap, int mems) rb_dlink_list * list, char c, int cap, int mems)
{ {
static char lmodebuf[BUFSIZE]; static char lmodebuf[BUFSIZE];
static char lparabuf[BUFSIZE]; static char lparabuf[BUFSIZE];
struct Ban *banptr; struct Ban *banptr;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *next_ptr; rb_dlink_node *next_ptr;
char *pbuf; char *pbuf;
int count = 0; int count = 0;
int cur_len, mlen, plen; int cur_len, mlen, plen;
@ -847,7 +847,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
cur_len = mlen = ircsprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname); cur_len = mlen = ircsprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
mbuf = lmodebuf + mlen; mbuf = lmodebuf + mlen;
DLINK_FOREACH_SAFE(ptr, next_ptr, list->head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
{ {
banptr = ptr->data; banptr = ptr->data;

View file

@ -174,7 +174,7 @@ find_squit(struct Client *client_p, struct Client *source_p, const char *server)
static struct squit_parms found_squit; static struct squit_parms found_squit;
struct Client *target_p = NULL; struct Client *target_p = NULL;
struct Client *p; struct Client *p;
dlink_node *ptr; rb_dlink_node *ptr;
/* must ALWAYS be reset */ /* must ALWAYS be reset */
found_squit.target_p = NULL; found_squit.target_p = NULL;
@ -186,7 +186,7 @@ find_squit(struct Client *client_p, struct Client *source_p, const char *server)
** when the command is issued by an oper. ** when the command is issued by an oper.
*/ */
DLINK_FOREACH(ptr, global_serv_list.head) RB_DLINK_FOREACH(ptr, global_serv_list.head)
{ {
p = ptr->data; p = ptr->data;
if(IsServer(p) || IsMe(p)) if(IsServer(p) || IsMe(p))

View file

@ -100,7 +100,7 @@ m_accept(struct Client *client_p, struct Client *source_p, int parc, const char
} }
/* get the number of accepts they have */ /* get the number of accepts they have */
accept_num = dlink_list_length(&source_p->localClient->allow_list); accept_num = rb_dlink_list_length(&source_p->localClient->allow_list);
/* parse the add list */ /* parse the add list */
for (nick = strtoken(&p, addbuf, ","); nick; nick = strtoken(&p, NULL, ",")) for (nick = strtoken(&p, addbuf, ","); nick; nick = strtoken(&p, NULL, ","))
@ -223,7 +223,7 @@ add_accept(struct Client *source_p, struct Client *target_p)
static void static void
list_accepts(struct Client *source_p) list_accepts(struct Client *source_p)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
struct Client *target_p; struct Client *target_p;
char nicks[BUFSIZE]; char nicks[BUFSIZE];
int len = 0; int len = 0;
@ -233,7 +233,7 @@ list_accepts(struct Client *source_p)
*nicks = '\0'; *nicks = '\0';
len2 = strlen(source_p->name) + 10; len2 = strlen(source_p->name) + 10;
DLINK_FOREACH(ptr, source_p->localClient->allow_list.head) RB_DLINK_FOREACH(ptr, source_p->localClient->allow_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -53,11 +53,11 @@ static int
mo_close(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) mo_close(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *ptr_next; rb_dlink_node *ptr_next;
int closed = 0; int closed = 0;
DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head) RB_DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -451,12 +451,12 @@ flush_write(struct Client *source_p, FILE * out, char *buf, char *temppath)
static int static int
remove_temp_dline(struct ConfItem *aconf) remove_temp_dline(struct ConfItem *aconf)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
int i; int i;
for (i = 0; i < LAST_TEMP_TYPE; i++) for (i = 0; i < LAST_TEMP_TYPE; i++)
{ {
DLINK_FOREACH(ptr, temp_dlines[i].head) RB_DLINK_FOREACH(ptr, temp_dlines[i].head)
{ {
if (aconf == ptr->data) if (aconf == ptr->data)
{ {

View file

@ -145,10 +145,10 @@ static void
do_etrace(struct Client *source_p, int ipv4, int ipv6) do_etrace(struct Client *source_p, int ipv4, int ipv6)
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
/* report all direct connections */ /* report all direct connections */
DLINK_FOREACH(ptr, lclient_list.head) RB_DLINK_FOREACH(ptr, lclient_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -173,9 +173,9 @@ do_etrace(struct Client *source_p, int ipv4, int ipv6)
static void static void
do_etrace_full(struct Client *source_p) do_etrace_full(struct Client *source_p)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, lclient_list.head) RB_DLINK_FOREACH(ptr, lclient_list.head)
{ {
do_single_etrace(source_p, ptr->data); do_single_etrace(source_p, ptr->data);
} }
@ -221,7 +221,7 @@ mo_chantrace(struct Client *client_p, struct Client *source_p, int parc, const c
struct membership *msptr; struct membership *msptr;
const char *sockhost; const char *sockhost;
const char *name; const char *name;
dlink_node *ptr; rb_dlink_node *ptr;
int operspy = 0; int operspy = 0;
name = parv[1]; name = parv[1];
@ -257,7 +257,7 @@ mo_chantrace(struct Client *client_p, struct Client *source_p, int parc, const c
return 0; return 0;
} }
DLINK_FOREACH(ptr, chptr->members.head) RB_DLINK_FOREACH(ptr, chptr->members.head)
{ {
msptr = ptr->data; msptr = ptr->data;
target_p = msptr->client_p; target_p = msptr->client_p;
@ -283,12 +283,12 @@ mo_chantrace(struct Client *client_p, struct Client *source_p, int parc, const c
} }
static void static void
match_masktrace(struct Client *source_p, dlink_list *list, match_masktrace(struct Client *source_p, rb_dlink_list *list,
const char *username, const char *hostname, const char *name, const char *username, const char *hostname, const char *name,
const char *gecos) const char *gecos)
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
const char *sockhost; const char *sockhost;
char *mangle_gecos = NULL; char *mangle_gecos = NULL;
@ -329,7 +329,7 @@ match_masktrace(struct Client *source_p, dlink_list *list,
mangle_gecos = LOCAL_COPY(gecos); mangle_gecos = LOCAL_COPY(gecos);
} }
DLINK_FOREACH(ptr, list->head) RB_DLINK_FOREACH(ptr, list->head)
{ {
target_p = ptr->data; target_p = ptr->data;
if(!IsPerson(target_p)) if(!IsPerson(target_p))

View file

@ -589,7 +589,7 @@ static int
majority_gline(struct Client *source_p, const char *user, majority_gline(struct Client *source_p, const char *user,
const char *host, const char *reason) const char *host, const char *reason)
{ {
dlink_node *pending_node; rb_dlink_node *pending_node;
struct gline_pending *pending; struct gline_pending *pending;
/* to avoid desync.. --fl */ /* to avoid desync.. --fl */
@ -599,7 +599,7 @@ majority_gline(struct Client *source_p, const char *user,
if(find_is_glined(host, user)) if(find_is_glined(host, user))
return NO; return NO;
DLINK_FOREACH(pending_node, pending_glines.head) RB_DLINK_FOREACH(pending_node, pending_glines.head)
{ {
pending = pending_node->data; pending = pending_node->data;
@ -696,14 +696,14 @@ static int
remove_temp_gline(const char *user, const char *host) remove_temp_gline(const char *user, const char *host)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
struct irc_sockaddr_storage addr, caddr; struct irc_sockaddr_storage addr, caddr;
int bits, cbits; int bits, cbits;
int mtype, gtype; int mtype, gtype;
mtype = parse_netmask(host, (struct sockaddr *)&addr, &bits); mtype = parse_netmask(host, (struct sockaddr *)&addr, &bits);
DLINK_FOREACH(ptr, glines.head) RB_DLINK_FOREACH(ptr, glines.head)
{ {
aconf = ptr->data; aconf = ptr->data;

View file

@ -96,8 +96,8 @@ dohelp(struct Client *source_p, int flags, const char *topic)
static const char ntopic[] = "index"; static const char ntopic[] = "index";
struct cachefile *hptr; struct cachefile *hptr;
struct cacheline *lineptr; struct cacheline *lineptr;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *fptr; rb_dlink_node *fptr;
if(EmptyString(topic)) if(EmptyString(topic))
topic = ntopic; topic = ntopic;
@ -118,7 +118,7 @@ dohelp(struct Client *source_p, int flags, const char *topic)
sendto_one(source_p, form_str(RPL_HELPSTART), sendto_one(source_p, form_str(RPL_HELPSTART),
me.name, source_p->name, topic, lineptr->data); me.name, source_p->name, topic, lineptr->data);
DLINK_FOREACH(ptr, fptr->next) RB_DLINK_FOREACH(ptr, fptr->next)
{ {
lineptr = ptr->data; lineptr = ptr->data;

View file

@ -196,17 +196,17 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
static void static void
add_invite(struct Channel *chptr, struct Client *who) add_invite(struct Channel *chptr, struct Client *who)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
/* already invited? */ /* already invited? */
DLINK_FOREACH(ptr, who->user->invited.head) RB_DLINK_FOREACH(ptr, who->user->invited.head)
{ {
if(ptr->data == chptr) if(ptr->data == chptr)
return; return;
} }
/* ok, if their invite list is too long, remove the tail */ /* ok, if their invite list is too long, remove the tail */
if((int)dlink_list_length(&who->user->invited) >= if((int)rb_dlink_list_length(&who->user->invited) >=
ConfigChannel.max_chans_per_user) ConfigChannel.max_chans_per_user)
{ {
ptr = who->user->invited.tail; ptr = who->user->invited.tail;

View file

@ -163,7 +163,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
return 0; return 0;
} }
/* if we have cluster servers, send it to them.. */ /* if we have cluster servers, send it to them.. */
else if(dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "KLINE", cluster_generic(source_p, "KLINE",
(tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN, (tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN,
"%lu %s %s :%s", "%lu %s %s :%s",
@ -409,7 +409,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
if(match(parv[3], me.name) == 0) if(match(parv[3], me.name) == 0)
return 0; return 0;
} }
else if(dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN, cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
"%s %s", user, host); "%s %s", user, host);
@ -912,12 +912,12 @@ flush_write(struct Client *source_p, FILE * out, const char *buf, const char *te
static int static int
remove_temp_kline(struct Client *source_p, struct ConfItem *aconf) remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
int i; int i;
for (i = 0; i < LAST_TEMP_TYPE; i++) for (i = 0; i < LAST_TEMP_TYPE; i++)
{ {
DLINK_FOREACH(ptr, temp_klines[i].head) RB_DLINK_FOREACH(ptr, temp_klines[i].head)
{ {
if (aconf == ptr->data) if (aconf == ptr->data)
{ {

View file

@ -106,7 +106,7 @@ m_knock(struct Client *client_p, struct Client *source_p, int parc, const char *
if(!((chptr->mode.mode & MODE_INVITEONLY) || (*chptr->mode.key) || if(!((chptr->mode.mode & MODE_INVITEONLY) || (*chptr->mode.key) ||
(chptr->mode.limit && (chptr->mode.limit &&
dlink_list_length(&chptr->members) >= (unsigned long)chptr->mode.limit))) rb_dlink_list_length(&chptr->members) >= (unsigned long)chptr->mode.limit)))
{ {
sendto_one_numeric(source_p, ERR_CHANOPEN, sendto_one_numeric(source_p, ERR_CHANOPEN,
form_str(ERR_CHANOPEN), name); form_str(ERR_CHANOPEN), name);

View file

@ -84,7 +84,7 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
char clean_mask[2 * HOSTLEN + 4]; char clean_mask[2 * HOSTLEN + 4];
hook_data hd; hook_data hd;
dlink_node *ptr; rb_dlink_node *ptr;
if(parc > 2) if(parc > 2)
{ {
@ -107,7 +107,7 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
call_hook(doing_links_hook, &hd); call_hook(doing_links_hook, &hd);
DLINK_FOREACH(ptr, global_serv_list.head) RB_DLINK_FOREACH(ptr, global_serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -49,7 +49,7 @@
#include "modules.h" #include "modules.h"
#include "event.h" #include "event.h"
static dlink_list safelisting_clients = { NULL, NULL, 0 }; static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
static int _modinit(void); static int _modinit(void);
static void _moddeinit(void); static void _moddeinit(void);
@ -326,7 +326,7 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
if (ShowChannel(source_p, chptr)) if (ShowChannel(source_p, chptr))
sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, chptr->chname, sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, chptr->chname,
dlink_list_length(&chptr->members), rb_dlink_list_length(&chptr->members),
chptr->topic == NULL ? "" : chptr->topic); chptr->topic == NULL ? "" : chptr->topic);
sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name); sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
@ -365,7 +365,7 @@ static void safelist_one_channel(struct Client *source_p, struct Channel *chptr)
*/ */
static void safelist_iterate_client(struct Client *source_p) static void safelist_iterate_client(struct Client *source_p)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
int iter; int iter;
for (iter = source_p->localClient->safelist_data->hash_indice; iter < CH_MAX; iter++) for (iter = source_p->localClient->safelist_data->hash_indice; iter < CH_MAX; iter++)
@ -376,7 +376,7 @@ static void safelist_iterate_client(struct Client *source_p)
return; return;
} }
DLINK_FOREACH(ptr, channelTable[iter].head) RB_DLINK_FOREACH(ptr, channelTable[iter].head)
safelist_one_channel(source_p, (struct Channel *) ptr->data); safelist_one_channel(source_p, (struct Channel *) ptr->data);
} }
@ -385,8 +385,8 @@ static void safelist_iterate_client(struct Client *source_p)
static void safelist_iterate_clients(void *unused) static void safelist_iterate_clients(void *unused)
{ {
dlink_node *n, *n2; rb_dlink_node *n, *n2;
DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head)
safelist_iterate_client((struct Client *)n->data); safelist_iterate_client((struct Client *)n->data);
} }

View file

@ -62,7 +62,7 @@ m_locops(struct Client *client_p, struct Client *source_p, int parc, const char
{ {
sendto_wallops_flags(UMODE_LOCOPS, source_p, "LOCOPS - %s", parv[1]); sendto_wallops_flags(UMODE_LOCOPS, source_p, "LOCOPS - %s", parv[1]);
if(dlink_list_length(&cluster_conf_list) > 0) if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "LOCOPS", SHARED_LOCOPS, CAP_CLUSTER, cluster_generic(source_p, "LOCOPS", SHARED_LOCOPS, CAP_CLUSTER,
":%s", parv[1]); ":%s", parv[1]);

View file

@ -89,7 +89,7 @@ dump_map(struct Client *client_p, struct Client *root_p, char *pbuf)
{ {
int cnt = 0, i = 0, len; int cnt = 0, i = 0, len;
struct Client *server_p; struct Client *server_p;
dlink_node *ptr; rb_dlink_node *ptr;
*pbuf = '\0'; *pbuf = '\0';
strlcat(pbuf, root_p->name, BUFSIZE); strlcat(pbuf, root_p->name, BUFSIZE);
@ -111,14 +111,14 @@ dump_map(struct Client *client_p, struct Client *root_p, char *pbuf)
} }
ircsnprintf(buf + USER_COL, BUFSIZE - USER_COL, ircsnprintf(buf + USER_COL, BUFSIZE - USER_COL,
" | Users: %5lu (%4.1f%%)", dlink_list_length(&root_p->serv->users), " | Users: %5lu (%4.1f%%)", rb_dlink_list_length(&root_p->serv->users),
100 * (float) dlink_list_length(&root_p->serv->users) / (float) Count.total); 100 * (float) rb_dlink_list_length(&root_p->serv->users) / (float) Count.total);
sendto_one_numeric(client_p, RPL_MAP, form_str(RPL_MAP), buf); sendto_one_numeric(client_p, RPL_MAP, form_str(RPL_MAP), buf);
if(root_p->serv->servers.head != NULL) if(root_p->serv->servers.head != NULL)
{ {
cnt += dlink_list_length(&root_p->serv->servers); cnt += rb_dlink_list_length(&root_p->serv->servers);
if(cnt) if(cnt)
{ {
@ -131,7 +131,7 @@ dump_map(struct Client *client_p, struct Client *root_p, char *pbuf)
} }
} }
i = 1; i = 1;
DLINK_FOREACH(ptr, root_p->serv->servers.head) RB_DLINK_FOREACH(ptr, root_p->serv->servers.head)
{ {
server_p = ptr->data; server_p = ptr->data;
*pbuf = ' '; *pbuf = ' ';

View file

@ -79,7 +79,7 @@ add_monitor(struct Client *client_p, const char *nicks)
if(EmptyString(name) || strlen(name) > NICKLEN-1) if(EmptyString(name) || strlen(name) > NICKLEN-1)
continue; continue;
if(dlink_list_length(&client_p->localClient->monitor_list) >= if(rb_dlink_list_length(&client_p->localClient->monitor_list) >=
ConfigFileEntry.max_monitor) ConfigFileEntry.max_monitor)
{ {
char buf[100]; char buf[100];
@ -166,7 +166,7 @@ del_monitor(struct Client *client_p, const char *nicks)
char *tmp; char *tmp;
char *p; char *p;
if(!dlink_list_length(&client_p->localClient->monitor_list)) if(!rb_dlink_list_length(&client_p->localClient->monitor_list))
return; return;
tmp = LOCAL_COPY(nicks); tmp = LOCAL_COPY(nicks);
@ -191,10 +191,10 @@ list_monitor(struct Client *client_p)
char buf[BUFSIZE]; char buf[BUFSIZE];
struct monitor *monptr; struct monitor *monptr;
char *nbuf; char *nbuf;
dlink_node *ptr; rb_dlink_node *ptr;
int mlen, arglen, cur_len; int mlen, arglen, cur_len;
if(!dlink_list_length(&client_p->localClient->monitor_list)) if(!rb_dlink_list_length(&client_p->localClient->monitor_list))
{ {
sendto_one(client_p, form_str(RPL_ENDOFMONLIST), sendto_one(client_p, form_str(RPL_ENDOFMONLIST),
me.name, client_p->name); me.name, client_p->name);
@ -205,7 +205,7 @@ list_monitor(struct Client *client_p)
me.name, client_p->name, ""); me.name, client_p->name, "");
nbuf = buf + mlen; nbuf = buf + mlen;
DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head) RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{ {
monptr = ptr->data; monptr = ptr->data;
@ -241,7 +241,7 @@ show_monitor_status(struct Client *client_p)
char *onptr, *offptr; char *onptr, *offptr;
int cur_onlen, cur_offlen; int cur_onlen, cur_offlen;
int mlen, arglen; int mlen, arglen;
dlink_node *ptr; rb_dlink_node *ptr;
mlen = cur_onlen = sprintf(onbuf, form_str(RPL_MONONLINE), mlen = cur_onlen = sprintf(onbuf, form_str(RPL_MONONLINE),
me.name, client_p->name, ""); me.name, client_p->name, "");
@ -251,7 +251,7 @@ show_monitor_status(struct Client *client_p)
onptr = onbuf + mlen; onptr = onbuf + mlen;
offptr = offbuf + mlen; offptr = offbuf + mlen;
DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head) RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{ {
monptr = ptr->data; monptr = ptr->data;

View file

@ -127,7 +127,7 @@ names_global(struct Client *source_p)
int tlen; int tlen;
int cur_len; int cur_len;
int dont_show = NO; int dont_show = NO;
dlink_node *lp, *ptr; rb_dlink_node *lp, *ptr;
struct Client *target_p; struct Client *target_p;
struct Channel *chptr = NULL; struct Channel *chptr = NULL;
struct membership *msptr; struct membership *msptr;
@ -135,7 +135,7 @@ names_global(struct Client *source_p)
char *t; char *t;
/* first do all visible channels */ /* first do all visible channels */
DLINK_FOREACH(ptr, global_channel_list.head) RB_DLINK_FOREACH(ptr, global_channel_list.head)
{ {
chptr = ptr->data; chptr = ptr->data;
channel_member_names(chptr, source_p, 0); channel_member_names(chptr, source_p, 0);
@ -145,7 +145,7 @@ names_global(struct Client *source_p)
t = buf + mlen; t = buf + mlen;
/* Second, do all clients in one big sweep */ /* Second, do all clients in one big sweep */
DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
dont_show = NO; dont_show = NO;
@ -160,7 +160,7 @@ names_global(struct Client *source_p)
* both were missed out above. if the target is on a * both were missed out above. if the target is on a
* common channel with source, its already been shown. * common channel with source, its already been shown.
*/ */
DLINK_FOREACH(lp, target_p->user->channel.head) RB_DLINK_FOREACH(lp, target_p->user->channel.head)
{ {
msptr = lp->data; msptr = lp->data;
chptr = msptr->chptr; chptr = msptr->chptr;

View file

@ -108,12 +108,12 @@ static void
rehash_glines(struct Client *source_p) rehash_glines(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines",
get_oper_name(source_p)); get_oper_name(source_p));
DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -126,13 +126,13 @@ static void
rehash_pglines(struct Client *source_p) rehash_pglines(struct Client *source_p)
{ {
struct gline_pending *glp_ptr; struct gline_pending *glp_ptr;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *next_ptr; rb_dlink_node *next_ptr;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines",
get_oper_name(source_p)); get_oper_name(source_p));
DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head)
{ {
glp_ptr = ptr->data; glp_ptr = ptr->data;
@ -147,7 +147,7 @@ static void
rehash_tklines(struct Client *source_p) rehash_tklines(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
int i; int i;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines",
@ -155,7 +155,7 @@ rehash_tklines(struct Client *source_p)
for(i = 0; i < LAST_TEMP_TYPE; i++) for(i = 0; i < LAST_TEMP_TYPE; i++)
{ {
DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -169,7 +169,7 @@ static void
rehash_tdlines(struct Client *source_p) rehash_tdlines(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
int i; int i;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines",
@ -177,7 +177,7 @@ rehash_tdlines(struct Client *source_p)
for(i = 0; i < LAST_TEMP_TYPE; i++) for(i = 0; i < LAST_TEMP_TYPE; i++)
{ {
DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -191,13 +191,13 @@ static void
rehash_txlines(struct Client *source_p) rehash_txlines(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *next_ptr; rb_dlink_node *next_ptr;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines",
get_oper_name(source_p)); get_oper_name(source_p));
DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -213,8 +213,8 @@ static void
rehash_tresvs(struct Client *source_p) rehash_tresvs(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *next_ptr; rb_dlink_node *next_ptr;
int i; int i;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs", sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
@ -232,7 +232,7 @@ rehash_tresvs(struct Client *source_p)
} }
HASH_WALK_END HASH_WALK_END
DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -266,14 +266,14 @@ static void
rehash_nickdelay(struct Client *source_p) rehash_nickdelay(struct Client *source_p)
{ {
struct nd_entry *nd; struct nd_entry *nd;
dlink_node *ptr; rb_dlink_node *ptr;
dlink_node *safe_ptr; rb_dlink_node *safe_ptr;
sendto_realops_snomask(SNO_GENERAL, L_ALL, sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s is clearing the nick delay table", "%s is clearing the nick delay table",
get_oper_name(source_p)); get_oper_name(source_p));
DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head) RB_DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head)
{ {
nd = ptr->data; nd = ptr->data;

View file

@ -58,7 +58,7 @@ static int
mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
dlink_node *ptr; rb_dlink_node *ptr;
struct Client *target_p; struct Client *target_p;
if(!IsOperDie(source_p)) if(!IsOperDie(source_p))
@ -79,14 +79,14 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0; return 0;
} }
DLINK_FOREACH(ptr, lclient_list.head) RB_DLINK_FOREACH(ptr, lclient_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
sendto_one_notice(target_p, ":Server Restarting. %s", get_client_name(source_p, HIDE_IP)); sendto_one_notice(target_p, ":Server Restarting. %s", get_client_name(source_p, HIDE_IP));
} }
DLINK_FOREACH(ptr, serv_list.head) RB_DLINK_FOREACH(ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -132,7 +132,7 @@ mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
if(match(target_server, me.name) == 0) if(match(target_server, me.name) == 0)
return 0; return 0;
} }
else if(dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_resv(source_p, temp_time, name, reason); cluster_resv(source_p, temp_time, name, reason);
parse_resv(source_p, name, reason, temp_time); parse_resv(source_p, name, reason, temp_time);
@ -337,9 +337,9 @@ cluster_resv(struct Client *source_p, int temp_time, const char *name,
const char *reason) const char *reason)
{ {
struct remote_conf *shared_p; struct remote_conf *shared_p;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, cluster_conf_list.head) RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
{ {
shared_p = ptr->data; shared_p = ptr->data;
@ -399,7 +399,7 @@ mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char
if(match(parv[3], me.name) == 0) if(match(parv[3], me.name) == 0)
return 0; return 0;
} }
else if(dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER,
"%s", parv[1]); "%s", parv[1]);
@ -484,9 +484,9 @@ remove_resv(struct Client *source_p, const char *name)
} }
else else
{ {
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, resv_conf_list.head) RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;

View file

@ -121,8 +121,8 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
const char *mask = NULL; const char *mask = NULL;
const char *c; const char *c;
struct Client *target_p; struct Client *target_p;
dlink_list *target_list = &lclient_list; /* local clients only by default */ rb_dlink_list *target_list = &lclient_list; /* local clients only by default */
dlink_node *tn; rb_dlink_node *tn;
int i; int i;
const char *sockhost; const char *sockhost;
char buf[512]; char buf[512];
@ -196,7 +196,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
} }
} }
DLINK_FOREACH(tn, target_list->head) RB_DLINK_FOREACH(tn, target_list->head)
{ {
unsigned int working_umodes = 0; unsigned int working_umodes = 0;
char maskbuf[BUFSIZE]; char maskbuf[BUFSIZE];

View file

@ -279,9 +279,9 @@ me_nickdelay(struct Client *client_p, struct Client *source_p, int parc, const c
static void static void
h_svc_server_introduced(hook_data_client *hdata) h_svc_server_introduced(hook_data_client *hdata)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, service_list.head) RB_DLINK_FOREACH(ptr, service_list.head)
{ {
if(!irccmp((const char *) ptr->data, hdata->target->name)) if(!irccmp((const char *) ptr->data, hdata->target->name))
{ {
@ -317,11 +317,11 @@ static void
h_svc_stats(hook_data_int *data) h_svc_stats(hook_data_int *data)
{ {
char statchar = (char) data->arg2; char statchar = (char) data->arg2;
dlink_node *ptr; rb_dlink_node *ptr;
if (statchar == 'U' && IsOper(data->client)) if (statchar == 'U' && IsOper(data->client))
{ {
DLINK_FOREACH(ptr, service_list.head) RB_DLINK_FOREACH(ptr, service_list.head)
{ {
sendto_one_numeric(data->client, RPL_STATSULINE, sendto_one_numeric(data->client, RPL_STATSULINE,
form_str(RPL_STATSULINE), form_str(RPL_STATSULINE),

View file

@ -238,14 +238,14 @@ quote_max(struct Client *source_p, int newval)
"%s!%s@%s set new MAXCLIENTS to %d (%lu current)", "%s!%s@%s set new MAXCLIENTS to %d (%lu current)",
source_p->name, source_p->username, source_p->host, source_p->name, source_p->username, source_p->host,
GlobalSetOptions.maxclients, GlobalSetOptions.maxclients,
dlink_list_length(&lclient_list)); rb_dlink_list_length(&lclient_list));
return; return;
} }
else else
{ {
sendto_one_notice(source_p, ":Current Maxclients = %d (%lu)", sendto_one_notice(source_p, ":Current Maxclients = %d (%lu)",
GlobalSetOptions.maxclients, dlink_list_length(&lclient_list)); GlobalSetOptions.maxclients, rb_dlink_list_length(&lclient_list));
} }
} }

View file

@ -25,7 +25,7 @@
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "tools.h" /* dlink_node/dlink_list */ #include "tools.h" /* rb_dlink_node/rb_dlink_list */
#include "class.h" /* report_classes */ #include "class.h" /* report_classes */
#include "client.h" /* Client */ #include "client.h" /* Client */
#include "common.h" /* TRUE/FALSE */ #include "common.h" /* TRUE/FALSE */
@ -73,7 +73,7 @@ DECLARE_MODULE_AV1(stats, NULL, NULL, stats_clist, stats_hlist, NULL, "$Revision
const char *Lformat = "%s %u %u %u %u %u :%u %u %s"; const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
static void stats_l_list(struct Client *s, const char *, int, int, dlink_list *, char); static void stats_l_list(struct Client *s, const char *, int, int, rb_dlink_list *, char);
static void stats_l_client(struct Client *source_p, struct Client *target_p, static void stats_l_client(struct Client *source_p, struct Client *target_p,
char statchar); char statchar);
@ -285,7 +285,7 @@ stats_connect(struct Client *source_p)
static char buf[5]; static char buf[5];
struct server_conf *server_p; struct server_conf *server_p;
char *s; char *s;
dlink_node *ptr; rb_dlink_node *ptr;
if((ConfigFileEntry.stats_c_oper_only || if((ConfigFileEntry.stats_c_oper_only ||
(ConfigServerHide.flatten_links && !IsExemptShide(source_p))) && (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
@ -296,7 +296,7 @@ stats_connect(struct Client *source_p)
return; return;
} }
DLINK_FOREACH(ptr, server_conf_list.head) RB_DLINK_FOREACH(ptr, server_conf_list.head)
{ {
server_p = ptr->data; server_p = ptr->data;
@ -464,12 +464,12 @@ stats_pending_glines (struct Client *source_p)
{ {
if(ConfigFileEntry.glines) if(ConfigFileEntry.glines)
{ {
dlink_node *pending_node; rb_dlink_node *pending_node;
struct gline_pending *glp_ptr; struct gline_pending *glp_ptr;
char timebuffer[MAX_DATE_STRING]; char timebuffer[MAX_DATE_STRING];
struct tm *tmptr; struct tm *tmptr;
DLINK_FOREACH (pending_node, pending_glines.head) RB_DLINK_FOREACH (pending_node, pending_glines.head)
{ {
glp_ptr = pending_node->data; glp_ptr = pending_node->data;
@ -496,7 +496,7 @@ stats_pending_glines (struct Client *source_p)
} }
} }
if(dlink_list_length (&pending_glines) > 0) if(rb_dlink_list_length (&pending_glines) > 0)
sendto_one_notice(source_p, ":End of Pending G-lines"); sendto_one_notice(source_p, ":End of Pending G-lines");
} }
else else
@ -515,10 +515,10 @@ stats_glines (struct Client *source_p)
{ {
if(ConfigFileEntry.glines) if(ConfigFileEntry.glines)
{ {
dlink_node *gline_node; rb_dlink_node *gline_node;
struct ConfItem *kill_ptr; struct ConfItem *kill_ptr;
DLINK_FOREACH_PREV (gline_node, glines.tail) RB_DLINK_FOREACH_PREV (gline_node, glines.tail)
{ {
kill_ptr = gline_node->data; kill_ptr = gline_node->data;
@ -540,7 +540,7 @@ static void
stats_hubleaf(struct Client *source_p) stats_hubleaf(struct Client *source_p)
{ {
struct remote_conf *hub_p; struct remote_conf *hub_p;
dlink_node *ptr; rb_dlink_node *ptr;
if((ConfigFileEntry.stats_h_oper_only || if((ConfigFileEntry.stats_h_oper_only ||
(ConfigServerHide.flatten_links && !IsExemptShide(source_p))) && (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
@ -551,7 +551,7 @@ stats_hubleaf(struct Client *source_p)
return; return;
} }
DLINK_FOREACH(ptr, hubleaf_conf_list.head) RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
{ {
hub_p = ptr->data; hub_p = ptr->data;
@ -650,13 +650,13 @@ stats_tklines(struct Client *source_p)
else else
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
int i; int i;
char *user, *host, *pass, *oper_reason; char *user, *host, *pass, *oper_reason;
for(i = 0; i < LAST_TEMP_TYPE; i++) for(i = 0; i < LAST_TEMP_TYPE; i++)
{ {
DLINK_FOREACH(ptr, temp_klines[i].head) RB_DLINK_FOREACH(ptr, temp_klines[i].head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -722,10 +722,10 @@ stats_messages(struct Client *source_p)
static void static void
stats_dnsbl(struct Client *source_p) stats_dnsbl(struct Client *source_p)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
struct Blacklist *blptr; struct Blacklist *blptr;
DLINK_FOREACH(ptr, blacklist_list.head) RB_DLINK_FOREACH(ptr, blacklist_list.head)
{ {
blptr = ptr->data; blptr = ptr->data;
@ -742,7 +742,7 @@ static void
stats_oper(struct Client *source_p) stats_oper(struct Client *source_p)
{ {
struct oper_conf *oper_p; struct oper_conf *oper_p;
dlink_node *ptr; rb_dlink_node *ptr;
if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only) if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
{ {
@ -751,7 +751,7 @@ stats_oper(struct Client *source_p)
return; return;
} }
DLINK_FOREACH(ptr, oper_conf_list.head) RB_DLINK_FOREACH(ptr, oper_conf_list.head)
{ {
oper_p = ptr->data; oper_p = ptr->data;
@ -773,10 +773,10 @@ static void
stats_operedup (struct Client *source_p) stats_operedup (struct Client *source_p)
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *oper_ptr; rb_dlink_node *oper_ptr;
unsigned int count = 0; unsigned int count = 0;
DLINK_FOREACH (oper_ptr, oper_list.head) RB_DLINK_FOREACH (oper_ptr, oper_list.head)
{ {
target_p = oper_ptr->data; target_p = oper_ptr->data;
@ -814,10 +814,10 @@ static void
stats_tresv(struct Client *source_p) stats_tresv(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
int i; int i;
DLINK_FOREACH(ptr, resv_conf_list.head) RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
if(aconf->hold) if(aconf->hold)
@ -842,10 +842,10 @@ static void
stats_resv(struct Client *source_p) stats_resv(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
int i; int i;
DLINK_FOREACH(ptr, resv_conf_list.head) RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
if(!aconf->hold) if(!aconf->hold)
@ -969,12 +969,12 @@ static void
stats_shared (struct Client *source_p) stats_shared (struct Client *source_p)
{ {
struct remote_conf *shared_p; struct remote_conf *shared_p;
dlink_node *ptr; rb_dlink_node *ptr;
char buf[15]; char buf[15];
char *p; char *p;
int i; int i;
DLINK_FOREACH(ptr, shared_conf_list.head) RB_DLINK_FOREACH(ptr, shared_conf_list.head)
{ {
shared_p = ptr->data; shared_p = ptr->data;
@ -996,7 +996,7 @@ stats_shared (struct Client *source_p)
shared_p->host, buf); shared_p->host, buf);
} }
DLINK_FOREACH(ptr, cluster_conf_list.head) RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
{ {
shared_p = ptr->data; shared_p = ptr->data;
@ -1028,7 +1028,7 @@ static void
stats_servers (struct Client *source_p) stats_servers (struct Client *source_p)
{ {
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
time_t seconds; time_t seconds;
int days, hours, minutes; int days, hours, minutes;
int j = 0; int j = 0;
@ -1041,7 +1041,7 @@ stats_servers (struct Client *source_p)
return; return;
} }
DLINK_FOREACH (ptr, serv_list.head) RB_DLINK_FOREACH (ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -1074,9 +1074,9 @@ static void
stats_tgecos(struct Client *source_p) stats_tgecos(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, xline_conf_list.head) RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -1092,9 +1092,9 @@ static void
stats_gecos(struct Client *source_p) stats_gecos(struct Client *source_p)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, xline_conf_list.head) RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -1125,11 +1125,11 @@ stats_memory (struct Client *source_p)
static void static void
stats_ziplinks (struct Client *source_p) stats_ziplinks (struct Client *source_p)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
struct Client *target_p; struct Client *target_p;
int sent_data = 0; int sent_data = 0;
DLINK_FOREACH (ptr, serv_list.head) RB_DLINK_FOREACH (ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
if(IsCapable (target_p, CAP_ZIP)) if(IsCapable (target_p, CAP_ZIP))
@ -1162,7 +1162,7 @@ stats_servlinks (struct Client *source_p)
static char Sformat[] = ":%s %d %s %s %u %u %u %u %u :%u %u %s"; static char Sformat[] = ":%s %d %s %s %u %u %u %u %u :%u %u %s";
long uptime, sendK, receiveK; long uptime, sendK, receiveK;
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
int j = 0; int j = 0;
if(ConfigServerHide.flatten_links && !IsOper (source_p) && if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
@ -1175,7 +1175,7 @@ stats_servlinks (struct Client *source_p)
sendK = receiveK = 0; sendK = receiveK = 0;
DLINK_FOREACH (ptr, serv_list.head) RB_DLINK_FOREACH (ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -1311,16 +1311,16 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
static void static void
stats_l_list(struct Client *source_p, const char *name, int doall, int wilds, stats_l_list(struct Client *source_p, const char *name, int doall, int wilds,
dlink_list * list, char statchar) rb_dlink_list * list, char statchar)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
struct Client *target_p; struct Client *target_p;
/* send information about connections which match. note, we /* send information about connections which match. note, we
* dont need tests for IsInvisible(), because non-opers will * dont need tests for IsInvisible(), because non-opers will
* never get here for normal clients --fl * never get here for normal clients --fl
*/ */
DLINK_FOREACH(ptr, list->head) RB_DLINK_FOREACH(ptr, list->head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -72,7 +72,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
char *name, *username, *hostname; char *name, *username, *hostname;
const char *sockhost; const char *sockhost;
char *gecos = NULL, *mangle_gecos = NULL; char *gecos = NULL, *mangle_gecos = NULL;
dlink_node *ptr; rb_dlink_node *ptr;
name = LOCAL_COPY(parv[1]); name = LOCAL_COPY(parv[1]);
collapse(name); collapse(name);
@ -139,7 +139,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
mangle_gecos = gecos; mangle_gecos = gecos;
} }
DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;

View file

@ -77,7 +77,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
const char *tname; const char *tname;
int doall = 0; int doall = 0;
int cnt = 0, wilds, dow; int cnt = 0, wilds, dow;
dlink_node *ptr; rb_dlink_node *ptr;
if(parc > 1) if(parc > 1)
{ {
@ -111,7 +111,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
if(ac2ptr == NULL) if(ac2ptr == NULL)
{ {
DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
ac2ptr = ptr->data; ac2ptr = ptr->data;
@ -197,7 +197,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
report_this_status(source_p, source_p, 0); report_this_status(source_p, source_p, 0);
} }
DLINK_FOREACH(ptr, local_oper_list.head) RB_DLINK_FOREACH(ptr, local_oper_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -209,7 +209,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
if (IsExemptShide(source_p) || !ConfigServerHide.flatten_links) if (IsExemptShide(source_p) || !ConfigServerHide.flatten_links)
{ {
DLINK_FOREACH(ptr, serv_list.head) RB_DLINK_FOREACH(ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -228,7 +228,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
/* source_p is opered */ /* source_p is opered */
/* report all direct connections */ /* report all direct connections */
DLINK_FOREACH(ptr, lclient_list.head) RB_DLINK_FOREACH(ptr, lclient_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -242,7 +242,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
cnt = report_this_status(source_p, target_p, dow); cnt = report_this_status(source_p, target_p, dow);
} }
DLINK_FOREACH(ptr, serv_list.head) RB_DLINK_FOREACH(ptr, serv_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -254,7 +254,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
if(MyConnect(source_p)) if(MyConnect(source_p))
{ {
DLINK_FOREACH(ptr, unknown_list.head) RB_DLINK_FOREACH(ptr, unknown_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
@ -280,7 +280,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
if(doall) if(doall)
{ {
DLINK_FOREACH(ptr, class_list.head) RB_DLINK_FOREACH(ptr, class_list.head)
{ {
cltmp = ptr->data; cltmp = ptr->data;
@ -307,11 +307,11 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
static void static void
count_downlinks(struct Client *server_p, int *pservcount, int *pusercount) count_downlinks(struct Client *server_p, int *pservcount, int *pusercount)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
(*pservcount)++; (*pservcount)++;
*pusercount += dlink_list_length(&server_p->serv->users); *pusercount += rb_dlink_list_length(&server_p->serv->users);
DLINK_FOREACH(ptr, server_p->serv->servers.head) RB_DLINK_FOREACH(ptr, server_p->serv->servers.head)
{ {
count_downlinks(ptr->data, pservcount, pusercount); count_downlinks(ptr->data, pservcount, pusercount);
} }

View file

@ -57,9 +57,9 @@ m_users(struct Client *client_p, struct Client *source_p, int parc, const char *
{ {
sendto_one_numeric(source_p, RPL_LOCALUSERS, sendto_one_numeric(source_p, RPL_LOCALUSERS,
form_str(RPL_LOCALUSERS), form_str(RPL_LOCALUSERS),
dlink_list_length(&lclient_list), rb_dlink_list_length(&lclient_list),
Count.max_loc, Count.max_loc,
dlink_list_length(&lclient_list), rb_dlink_list_length(&lclient_list),
Count.max_loc); Count.max_loc);
sendto_one_numeric(source_p, RPL_GLOBALUSERS, sendto_one_numeric(source_p, RPL_GLOBALUSERS,

View file

@ -75,7 +75,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
struct Client *target_p; struct Client *target_p;
struct membership *msptr; struct membership *msptr;
char *mask; char *mask;
dlink_node *lp; rb_dlink_node *lp;
struct Channel *chptr = NULL; struct Channel *chptr = NULL;
int server_oper = parc > 2 ? (*parv[2] == 'o') : 0; /* Show OPERS only */ int server_oper = parc > 2 ? (*parv[2] == 'o') : 0; /* Show OPERS only */
int member; int member;
@ -143,7 +143,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
int isinvis = 0; int isinvis = 0;
isinvis = IsInvisible(target_p); isinvis = IsInvisible(target_p);
DLINK_FOREACH(lp, target_p->user->channel.head) RB_DLINK_FOREACH(lp, target_p->user->channel.head)
{ {
msptr = lp->data; msptr = lp->data;
chptr = msptr->chptr; chptr = msptr->chptr;
@ -225,9 +225,9 @@ who_common_channel(struct Client *source_p, struct Channel *chptr,
{ {
struct membership *msptr; struct membership *msptr;
struct Client *target_p; struct Client *target_p;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, chptr->members.head) RB_DLINK_FOREACH(ptr, chptr->members.head)
{ {
msptr = ptr->data; msptr = ptr->data;
target_p = msptr->client_p; target_p = msptr->client_p;
@ -272,7 +272,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
{ {
struct membership *msptr; struct membership *msptr;
struct Client *target_p; struct Client *target_p;
dlink_node *lp, *ptr; rb_dlink_node *lp, *ptr;
int maxmatches = 500; int maxmatches = 500;
/* first, list all matching INvisible clients on common channels /* first, list all matching INvisible clients on common channels
@ -280,7 +280,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
*/ */
if(!operspy) if(!operspy)
{ {
DLINK_FOREACH(lp, source_p->user->channel.head) RB_DLINK_FOREACH(lp, source_p->user->channel.head)
{ {
msptr = lp->data; msptr = lp->data;
who_common_channel(source_p, msptr->chptr, mask, server_oper, &maxmatches); who_common_channel(source_p, msptr->chptr, mask, server_oper, &maxmatches);
@ -294,7 +294,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
* if this is an operspy who, list all matching clients, no need * if this is an operspy who, list all matching clients, no need
* to clear marks * to clear marks
*/ */
DLINK_FOREACH(ptr, global_client_list.head) RB_DLINK_FOREACH(ptr, global_client_list.head)
{ {
target_p = ptr->data; target_p = ptr->data;
if(!IsPerson(target_p)) if(!IsPerson(target_p))
@ -346,10 +346,10 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr,
{ {
struct Client *target_p; struct Client *target_p;
struct membership *msptr; struct membership *msptr;
dlink_node *ptr; rb_dlink_node *ptr;
int combine = IsCapable(source_p, CLICAP_MULTI_PREFIX); int combine = IsCapable(source_p, CLICAP_MULTI_PREFIX);
DLINK_FOREACH(ptr, chptr->members.head) RB_DLINK_FOREACH(ptr, chptr->members.head)
{ {
msptr = ptr->data; msptr = ptr->data;
target_p = msptr->client_p; target_p = msptr->client_p;

View file

@ -230,7 +230,7 @@ static void
single_whois(struct Client *source_p, struct Client *target_p, int operspy) single_whois(struct Client *source_p, struct Client *target_p, int operspy)
{ {
char buf[BUFSIZE]; char buf[BUFSIZE];
dlink_node *ptr; rb_dlink_node *ptr;
struct membership *msptr; struct membership *msptr;
struct Channel *chptr; struct Channel *chptr;
int cur_len = 0; int cur_len = 0;
@ -279,7 +279,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
if (!IsService(target_p)) if (!IsService(target_p))
{ {
DLINK_FOREACH(ptr, target_p->user->channel.head) RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
{ {
msptr = ptr->data; msptr = ptr->data;
chptr = msptr->chptr; chptr = msptr->chptr;

View file

@ -154,7 +154,7 @@ mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char
if(!match(target_server, me.name)) if(!match(target_server, me.name))
return 0; return 0;
} }
else if(dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_xline(source_p, temp_time, name, reason); cluster_xline(source_p, temp_time, name, reason);
if((aconf = find_xline_mask(name)) != NULL) if((aconf = find_xline_mask(name)) != NULL)
@ -418,9 +418,9 @@ cluster_xline(struct Client *source_p, int temp_time, const char *name,
const char *reason) const char *reason)
{ {
struct remote_conf *shared_p; struct remote_conf *shared_p;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, cluster_conf_list.head) RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
{ {
shared_p = ptr->data; shared_p = ptr->data;
@ -475,7 +475,7 @@ mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const cha
if(match(parv[3], me.name) == 0) if(match(parv[3], me.name) == 0)
return 0; return 0;
} }
else if(dlink_list_length(&cluster_conf_list)) else if(rb_dlink_list_length(&cluster_conf_list))
cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER,
"%s", parv[1]); "%s", parv[1]);
@ -534,9 +534,9 @@ static void
remove_xline(struct Client *source_p, const char *name) remove_xline(struct Client *source_p, const char *name)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
dlink_node *ptr; rb_dlink_node *ptr;
DLINK_FOREACH(ptr, xline_conf_list.head) RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;

View file

@ -61,12 +61,12 @@ DECLARE_MODULE_AV1(networknotice, NULL, NULL, NULL, NULL, nn_hfnlist, "$Revision
static void static void
count_mark_downlinks(struct Client *server_p, int *pservcount, int *pusercount) count_mark_downlinks(struct Client *server_p, int *pservcount, int *pusercount)
{ {
dlink_node *ptr; rb_dlink_node *ptr;
SetFloodDone(server_p); SetFloodDone(server_p);
(*pservcount)++; (*pservcount)++;
*pusercount += dlink_list_length(&server_p->serv->users); *pusercount += rb_dlink_list_length(&server_p->serv->users);
DLINK_FOREACH(ptr, server_p->serv->servers.head) RB_DLINK_FOREACH(ptr, server_p->serv->servers.head)
{ {
count_mark_downlinks(ptr->data, pservcount, pusercount); count_mark_downlinks(ptr->data, pservcount, pusercount);
} }

View file

@ -1,587 +0,0 @@
cache.o: cache.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/common.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../libcharybdis/tools.h ../include/client.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/event.h ../include/hash.h ../include/cache.h \
../include/sprintf_irc.h
channel.o: channel.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/channel.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/hash.h \
../include/hook.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/numeric.h ../include/s_serv.h \
../include/s_user.h ../include/send.h ../include/whowas.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../libcharybdis/event.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h ../include/s_log.h
chmode.o: chmode.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/channel.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/hash.h \
../include/hook.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/numeric.h ../include/s_serv.h \
../include/s_user.h ../include/send.h ../include/whowas.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../libcharybdis/event.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h ../include/s_log.h
class.o: class.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../libcharybdis/tools.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/ircd.h \
../include/numeric.h ../include/s_conf.h ../include/class.h \
../include/patricia.h ../include/numeric.h ../include/s_newconf.h \
../include/send.h ../include/irc_string.h ../libcharybdis/memory.h \
../include/patricia.h
client.o: client.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../libcharybdis/tools.h ../include/client.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/class.h ../include/common.h \
../libcharybdis/event.h ../include/hash.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../include/s_gline.h \
../include/numeric.h ../include/packet.h ../include/s_auth.h \
../libcharybdis/commio.h ../include/s_conf.h ../include/class.h \
../include/patricia.h ../include/numeric.h ../include/s_newconf.h \
../include/s_log.h ../include/s_serv.h ../include/s_stats.h \
../include/send.h ../include/whowas.h ../include/s_user.h \
../libcharybdis/linebuf.h ../libcharybdis/memory.h \
../include/hostmask.h ../libcharybdis/balloc.h ../include/listener.h \
../include/hook.h ../include/msg.h ../include/monitor.h
getopt.o: getopt.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_getopt.h
hash.o: hash.c ../include/stdinc.h ../include/config.h ../include/setup.h \
../include/defaults.h ../include/ircd_defs.h ../include/s_log.h \
../include/ircd_defs.h ../include/send.h ../libcharybdis/tools.h \
../include/s_conf.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/patricia.h ../include/numeric.h ../include/channel.h \
../include/client.h ../include/common.h ../include/hash.h \
../include/irc_string.h ../include/ircd.h ../include/numeric.h \
../include/send.h ../libcharybdis/memory.h ../include/msg.h \
../include/cache.h ../include/s_newconf.h
hook.o: hook.c ../include/stdinc.h ../include/config.h ../include/setup.h \
../include/defaults.h ../libcharybdis/memory.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/setup.h ../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/tools.h ../include/hook.h \
../include/irc_string.h
hostmask.o: hostmask.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/memory.h \
../include/ircd_defs.h ../include/s_log.h ../include/ircd_defs.h \
../include/send.h ../include/setup.h ../libcharybdis/balloc.h \
../libcharybdis/tools.h ../libcharybdis/memory.h ../include/ircd_defs.h \
../include/s_conf.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../libcharybdis/linebuf.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/config.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../include/snomask.h ../include/patricia.h ../include/numeric.h \
../include/hostmask.h ../include/numeric.h ../include/send.h \
../include/irc_string.h
irc_string.o: irc_string.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/sprintf_irc.h \
../libcharybdis/tools.h ../include/irc_string.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../include/client.h \
../libcharybdis/linebuf.h ../libcharybdis/tools.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/setup.h ../include/config.h ../include/ircd_defs.h \
../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../libcharybdis/memory.h ../include/setup.h
ircd.o: ircd.c ../include/stdinc.h ../include/config.h ../include/setup.h \
../include/defaults.h ../include/setup.h ../include/config.h \
../libcharybdis/tools.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/ircd_defs.h ../include/s_log.h \
../include/ircd_defs.h ../include/send.h ../include/setup.h \
../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/channel.h ../include/class.h \
../include/client.h ../libcharybdis/linebuf.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/config.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
../include/client.h ../include/common.h ../libcharybdis/event.h \
../include/hash.h ../include/irc_string.h ../include/ircd_signal.h \
../include/sprintf_irc.h ../include/s_gline.h ../include/msg.h \
../include/hostmask.h ../include/numeric.h ../include/parse.h \
../include/res.h ../include/restart.h ../include/s_auth.h \
../libcharybdis/commio.h ../include/s_conf.h ../include/class.h \
../include/patricia.h ../include/numeric.h ../include/s_log.h \
../include/s_serv.h ../include/s_user.h ../include/s_stats.h \
../include/scache.h ../include/send.h ../include/whowas.h \
../include/modules.h ../include/parse.h ../include/msg.h \
../include/hook.h ../libcharybdis/memory.h ../include/hook.h \
../include/ircd_getopt.h ../libcharybdis/balloc.h ../include/newconf.h \
../include/patricia.h ../include/reject.h ../include/s_newconf.h \
../include/cache.h ../include/monitor.h ../libcharybdis/libcharybdis.h \
../include/stdinc.h ../include/res.h ../include/numeric.h \
../libcharybdis/linebuf.h ../include/sprintf_irc.h \
../libcharybdis/commio.h ../libcharybdis/event.h \
../include/patchlevel.h ../include/serno.h
ircd_signal.o: ircd_signal.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_signal.h \
../include/ircd.h ../libcharybdis/tools.h ../libcharybdis/memory.h \
../include/ircd_defs.h ../include/s_log.h ../include/ircd_defs.h \
../include/send.h ../include/setup.h ../libcharybdis/balloc.h \
../libcharybdis/tools.h ../libcharybdis/memory.h ../include/restart.h \
../include/s_log.h ../libcharybdis/memory.h ../libcharybdis/commio.h \
../include/config.h ../include/s_conf.h ../include/class.h \
../include/client.h ../libcharybdis/linebuf.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/client.h ../include/send.h
ircd_state.o: ircd_state.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/setup.h \
../include/config.h ../include/client.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../libcharybdis/tools.h ../include/ircd.h \
../include/channel.h ../include/class.h ../include/common.h \
../libcharybdis/event.h ../include/hash.h ../include/irc_string.h \
../include/ircd_signal.h ../include/sprintf_irc.h ../include/s_gline.h \
../include/msg.h ../include/hostmask.h ../include/numeric.h \
../include/parse.h ../include/res.h ../include/restart.h \
../include/s_auth.h ../libcharybdis/commio.h ../include/s_conf.h \
../include/class.h ../include/patricia.h ../include/numeric.h \
../include/s_log.h ../include/s_serv.h ../include/s_user.h \
../include/s_stats.h ../include/scache.h ../include/send.h \
../include/whowas.h ../include/modules.h ../include/parse.h \
../include/msg.h ../include/hook.h ../libcharybdis/memory.h \
../include/hook.h ../include/ircd_getopt.h ../libcharybdis/balloc.h \
../include/newconf.h ../include/patricia.h ../include/reject.h \
../include/s_newconf.h ../include/cache.h ../include/monitor.h \
../libcharybdis/libcharybdis.h ../include/stdinc.h ../include/res.h \
../include/numeric.h ../libcharybdis/linebuf.h ../include/sprintf_irc.h \
../libcharybdis/commio.h ../libcharybdis/event.h \
../include/patchlevel.h ../include/serno.h
kdparse.o: kdparse.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/s_log.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/hostmask.h \
../include/client.h ../include/irc_string.h ../libcharybdis/memory.h \
../include/hash.h
listener.o: listener.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/setup.h \
../include/listener.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
../libcharybdis/commio.h ../include/s_conf.h ../include/class.h \
../include/patricia.h ../include/numeric.h ../include/s_newconf.h \
../include/s_stats.h ../include/send.h ../libcharybdis/memory.h \
../include/s_auth.h ../include/reject.h
match.o: match.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../include/ircd.h ../include/irc_string.h
modules.o: modules.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/modules.h \
../include/parse.h ../libcharybdis/tools.h ../include/msg.h \
../libcharybdis/memory.h ../include/ircd_defs.h ../include/s_log.h \
../include/ircd_defs.h ../include/send.h ../include/setup.h \
../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/hook.h ../include/s_log.h \
../include/ircd.h ../include/client.h ../libcharybdis/linebuf.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/config.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../include/snomask.h ../include/client.h ../include/send.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/numeric.h \
../include/parse.h ../include/ircd_defs.h ../include/irc_string.h \
../libcharybdis/memory.h ../libcharybdis/tools.h \
../include/sprintf_irc.h
monitor.o: monitor.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h ../include/monitor.h \
../include/hash.h ../libcharybdis/event.h ../include/numeric.h
newconf.o: newconf.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/memory.h \
../include/ircd_defs.h ../include/s_log.h ../include/ircd_defs.h \
../include/send.h ../include/setup.h ../libcharybdis/balloc.h \
../libcharybdis/tools.h ../libcharybdis/memory.h ../include/newconf.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/config.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../include/snomask.h ../libcharybdis/tools.h \
../include/ircd_defs.h ../include/sprintf_irc.h ../include/common.h \
../include/s_log.h ../include/s_conf.h ../include/class.h \
../include/patricia.h ../include/numeric.h ../include/s_user.h \
../include/s_newconf.h ../include/send.h ../include/setup.h \
../include/modules.h ../include/parse.h ../include/msg.h \
../include/hook.h ../include/listener.h ../include/hostmask.h \
../include/s_serv.h ../libcharybdis/event.h ../include/hash.h \
../include/cache.h ../include/ircd.h ../include/snomask.h
numeric.o: numeric.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/setup.h \
../include/config.h ../include/s_conf.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/numeric.h ../include/irc_string.h \
../include/common.h ../libcharybdis/memory.h messages.tab
packet.o: packet.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/s_log.h ../include/ircd_defs.h \
../include/send.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/s_serv.h ../include/client.h \
../include/common.h ../include/ircd.h ../include/parse.h \
../include/packet.h ../include/irc_string.h ../libcharybdis/memory.h \
../include/hook.h ../include/send.h
parse.o: parse.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/parse.h \
../libcharybdis/tools.h ../include/client.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../include/channel.h ../include/common.h ../include/hash.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../include/numeric.h ../include/s_log.h ../include/s_stats.h \
../include/send.h ../include/msg.h ../include/s_conf.h \
../include/class.h ../include/patricia.h ../include/numeric.h \
../libcharybdis/memory.h ../include/s_serv.h
patricia.o: patricia.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../include/ircd_defs.h ../include/s_log.h ../include/ircd_defs.h \
../include/send.h ../include/patricia.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/numeric.h \
../libcharybdis/balloc.h
res.o: res.c ../include/stdinc.h ../include/config.h ../include/setup.h \
../include/defaults.h ../include/ircd_defs.h ../include/s_log.h \
../include/ircd_defs.h ../include/send.h ../include/common.h \
../include/ircd.h ../libcharybdis/tools.h ../libcharybdis/memory.h \
../include/ircd_defs.h ../include/setup.h ../libcharybdis/balloc.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/commio.h ../include/config.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../include/reslib.h ../libcharybdis/tools.h ../libcharybdis/event.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/numeric.h
reslib.o: reslib.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/common.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/ircd_defs.h ../include/setup.h \
../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/commio.h ../include/config.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/reslib.h ../libcharybdis/tools.h \
../libcharybdis/event.h ../include/irc_string.h \
../include/sprintf_irc.h
reject.o: reject.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../include/patricia.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/numeric.h ../include/client.h ../include/s_conf.h \
../include/patricia.h ../libcharybdis/event.h ../libcharybdis/tools.h \
../include/reject.h ../include/s_stats.h ../include/msg.h
restart.o: restart.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/restart.h ../include/common.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/setup.h ../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/send.h ../include/s_log.h \
../include/client.h ../libcharybdis/linebuf.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/config.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
../include/client.h ../libcharybdis/memory.h
s_auth.o: s_auth.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/config.h \
../libcharybdis/tools.h ../include/s_auth.h ../include/res.h \
../include/ircd_defs.h ../include/s_log.h ../include/send.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../include/s_conf.h ../include/class.h \
../include/client.h ../libcharybdis/linebuf.h ../include/channel.h \
../include/snomask.h ../include/patricia.h ../include/numeric.h \
../include/client.h ../include/common.h ../libcharybdis/event.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../include/numeric.h ../include/packet.h ../include/res.h \
../libcharybdis/commio.h ../include/s_log.h ../include/s_stats.h \
../include/send.h ../libcharybdis/memory.h ../include/hook.h
s_conf.o: s_conf.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../libcharybdis/tools.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/s_serv.h \
../include/s_stats.h ../include/channel.h ../include/class.h \
../include/client.h ../include/common.h ../libcharybdis/event.h \
../include/hash.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/listener.h ../include/hostmask.h \
../include/modules.h ../include/parse.h ../include/msg.h \
../include/hook.h ../include/numeric.h ../libcharybdis/commio.h \
../include/s_log.h ../include/send.h ../include/s_gline.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h ../include/patricia.h \
../include/reject.h ../include/cache.h
s_newconf.o: s_newconf.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/common.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../libcharybdis/tools.h \
../include/client.h ../libcharybdis/memory.h ../include/s_serv.h \
../include/send.h ../include/hostmask.h ../include/newconf.h \
../include/hash.h ../libcharybdis/balloc.h ../libcharybdis/event.h \
../include/sprintf_irc.h
s_gline.o: s_gline.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/channel.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/config.h \
../include/irc_string.h ../include/ircd.h ../include/hostmask.h \
../include/numeric.h ../libcharybdis/commio.h ../include/s_conf.h \
../include/class.h ../include/patricia.h ../include/numeric.h \
../include/scache.h ../include/send.h ../include/msg.h \
../include/s_serv.h ../include/s_gline.h ../include/hash.h \
../libcharybdis/event.h ../libcharybdis/memory.h
s_log.o: s_log.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
../include/s_log.h ../include/ircd_defs.h ../include/send.h \
../include/s_log.h ../include/s_conf.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/patricia.h \
../include/numeric.h ../include/sprintf_irc.h ../include/send.h \
../include/client.h ../include/s_serv.h
s_serv.o: s_serv.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/s_serv.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../libcharybdis/event.h \
../include/hash.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
../include/packet.h ../include/res.h ../libcharybdis/commio.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/s_log.h \
../include/s_stats.h ../include/s_user.h ../include/scache.h \
../include/send.h ../libcharybdis/memory.h ../include/channel.h \
../include/hook.h ../include/msg.h
s_stats.o: s_stats.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/s_stats.h \
../include/client.h ../include/ircd_defs.h ../include/s_log.h \
../include/send.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../include/irc_string.h ../include/ircd.h ../include/numeric.h \
../libcharybdis/commio.h ../include/send.h ../libcharybdis/memory.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/whowas.h \
../include/hash.h ../include/scache.h ../include/reject.h
s_user.o: s_user.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../libcharybdis/tools.h \
../include/s_user.h ../include/channel.h ../include/ircd_defs.h \
../include/s_log.h ../include/send.h ../include/class.h \
../libcharybdis/tools.h ../include/client.h ../libcharybdis/linebuf.h \
../libcharybdis/tools.h ../include/channel.h ../include/res.h \
../include/common.h ../libcharybdis/commio.h ../include/setup.h \
../include/config.h ../include/ircd_defs.h ../include/reslib.h \
../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../include/common.h ../include/hash.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../include/listener.h \
../include/msg.h ../include/numeric.h ../libcharybdis/commio.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../include/s_newconf.h ../include/s_log.h \
../include/s_serv.h ../include/s_stats.h ../include/scache.h \
../include/send.h ../include/supported.h ../include/whowas.h \
../libcharybdis/memory.h ../include/packet.h ../include/reject.h \
../include/cache.h ../include/hook.h ../include/monitor.h \
../include/snomask.h
scache.o: scache.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/client.h \
../include/ircd_defs.h ../include/s_log.h ../include/send.h \
../libcharybdis/linebuf.h ../libcharybdis/tools.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/setup.h ../include/config.h ../include/ircd_defs.h \
../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/irc_string.h \
../include/ircd.h ../include/numeric.h ../include/send.h \
../include/scache.h ../libcharybdis/memory.h
send.o: send.c ../include/stdinc.h ../include/config.h ../include/setup.h \
../include/defaults.h ../libcharybdis/tools.h ../include/send.h \
../include/ircd_defs.h ../include/s_log.h ../include/send.h \
../include/channel.h ../include/class.h ../libcharybdis/tools.h \
../include/client.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/common.h ../include/irc_string.h \
../include/ircd.h ../include/numeric.h ../libcharybdis/commio.h \
../include/s_serv.h ../include/sprintf_irc.h ../include/s_conf.h \
../include/class.h ../include/patricia.h ../include/numeric.h \
../include/s_newconf.h ../libcharybdis/linebuf.h ../include/s_log.h \
../libcharybdis/memory.h ../include/hook.h
snomask.o: snomask.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/client.h \
../include/ircd_defs.h ../include/s_log.h ../include/send.h \
../libcharybdis/linebuf.h ../libcharybdis/tools.h ../include/channel.h \
../include/res.h ../include/common.h ../libcharybdis/commio.h \
../include/setup.h ../include/config.h ../include/ircd_defs.h \
../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
../include/ircd.h ../libcharybdis/tools.h ../libcharybdis/memory.h \
../libcharybdis/balloc.h ../libcharybdis/memory.h ../include/snomask.h \
../include/client.h ../include/snomask.h
whowas.o: whowas.c ../include/stdinc.h ../include/config.h \
../include/setup.h ../include/defaults.h ../include/whowas.h \
../include/ircd_defs.h ../include/s_log.h ../include/send.h \
../include/client.h ../libcharybdis/linebuf.h ../libcharybdis/tools.h \
../include/channel.h ../include/res.h ../include/common.h \
../libcharybdis/commio.h ../include/setup.h ../include/config.h \
../include/ircd_defs.h ../include/reslib.h ../include/irc_string.h \
../include/sprintf_irc.h ../include/ircd.h ../libcharybdis/tools.h \
../libcharybdis/memory.h ../libcharybdis/balloc.h \
../libcharybdis/memory.h ../include/snomask.h ../include/client.h \
../include/common.h ../include/hash.h ../include/irc_string.h \
../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
../include/s_serv.h ../include/s_user.h ../include/send.h \
../include/s_conf.h ../include/class.h ../include/patricia.h \
../include/numeric.h ../libcharybdis/memory.h