#endif
#include "ircd_defs.h"
-#include "linebuf.h"
#include "channel.h"
#include "res.h"
#include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
-#include "commio.h"
/* other structs */
struct Blacklist;
*/
struct User
{
- dlink_list channel; /* chain of channel pointer blocks */
- dlink_list invited; /* chain of invite pointer blocks */
+ rb_dlink_list channel; /* chain of channel pointer blocks */
+ rb_dlink_list invited; /* chain of invite pointer blocks */
char *away; /* pointer to away message */
int refcnt; /* Number of times this block is referenced */
{
user_t *user; /* who activated this connection */
char by[NICKLEN];
- dlink_list servers;
- dlink_list users;
+ rb_dlink_list servers;
+ rb_dlink_list users;
int caps; /* capabilities bit-field */
char *fullcaps;
struct scache_entry *nameinfo;
};
-struct SlinkRpl
-{
- int command;
- int datalen;
- int gotdatalen;
- int readdata;
- unsigned char *data;
-};
-
struct ZipStats
{
- unsigned long in;
- unsigned long in_wire;
- unsigned long out;
- unsigned long out_wire;
- unsigned long inK;
- unsigned long inK_wire;
- unsigned long outK;
- unsigned long outK_wire;
+ unsigned long long in;
+ unsigned long long in_wire;
+ unsigned long long out;
+ unsigned long long out_wire;
double in_ratio;
double out_ratio;
};
struct Client
{
- dlink_node node;
- dlink_node lnode;
+ rb_dlink_node node;
+ rb_dlink_node lnode;
user_t *user; /* ...defined, if this is a User */
server_t *serv; /* ...defined, if this is a server */
client_t *servptr; /* Points to server this Client is on */
/* list of who has this client on their allow list, its counterpart
* is in LocalUser
*/
- dlink_list on_allow_list;
+ rb_dlink_list on_allow_list;
local_user_t *localClient;
pre_client_t *preClient;
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
* (directly connected to *this* server with a socket.
conf_item_t *att_conf; /* attached conf */
struct server_conf *att_sconf;
- struct irc_sockaddr_storage ip;
+ struct rb_sockaddr_storage ip;
time_t last_nick_change;
int number_of_nick_changes;
char *fullcaps;
int caps; /* capabilities bit-field */
- int fd; /* >= 0, for local clients */
+ rb_fde_t *F; /* >= 0, for local clients */
/* time challenge response is valid for */
time_t chal_time;
- int ctrlfd; /* For servers:
- control fd used for sending commands
- to servlink */
-
- struct SlinkRpl slinkrpl; /* slink reply being parsed */
- unsigned char *slinkq; /* sendq for control data */
- int slinkq_ofs; /* ofset into slinkq */
- int slinkq_len; /* length remaining after slinkq_ofs */
-
- struct ZipStats zipstats;
+ struct DNSQuery *dnsquery; /* for outgoing server's name lookup */
time_t last_away; /* Away since... */
time_t last;
/* clients allowed to talk through +g */
- dlink_list allow_list;
+ rb_dlink_list allow_list;
/* nicknames theyre monitoring */
- dlink_list monitor_list;
+ rb_dlink_list monitor_list;
/*
* Anti-flood stuff. We track how many messages were parsed and how
auth_request_t *auth_request;
/* target change stuff */
- void *targets[10]; /* targets were aware of */
+ uint32_t targets[10]; /* targets were aware of (fnv32(use_id(target_p))) */
unsigned int targinfo[2]; /* cyclic array, no in use */
time_t target_last; /* last time we cleared a slot */
char *mangledhost; /* non-NULL if host mangling module loaded and
applicable to this client */
+
+ struct _ssl_ctl *ssl_ctl; /* which ssl daemon we're associate with */
+ rb_uint32_t localflags;
+ struct ZipStats *zipstats; /* zipstats */
+ rb_uint16_t cork_count; /* used for corking/uncorking connections */
+ struct ev_entry *event; /* used for associated events */
};
struct PreClient
unsigned char sasl_out;
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 */
};
* ts stuff
*/
#define TS_CURRENT 6
-
-#ifdef TS6_ONLY
#define TS_MIN 6
-#else
-#define TS_MIN 3
-#endif
#define TS_DOESTS 0x10000000
#define DoesTS(x) ((x)->tsinfo & TS_DOESTS)
#define FLAGS_DEAD 0x0002 /* Local socket is dead--Exiting soon */
#define FLAGS_KILLED 0x0004 /* Prevents "QUIT" from being sent for this */
#define FLAGS_SENTUSER 0x0008 /* Client sent a USER command. */
+#define FLAGS_CLICAP 0x0010 /* In CAP negotiation, wait for CAP END */
#define FLAGS_CLOSING 0x0020 /* set when closing to suppress errors */
+#define FLAGS_PING_COOKIE 0x0040 /* has sent ping cookie */
#define FLAGS_GOTID 0x0080 /* successful ident lookup achieved */
+#define FLAGS_FLOODDONE 0x0100 /* flood grace period over / reported */
#define FLAGS_NORMALEX 0x0400 /* Client exited normally */
#define FLAGS_SENDQEX 0x0800 /* Sendq exceeded */
#define FLAGS_SERVLINK 0x10000 /* servlink has servlink process */
#define FLAGS_DYNSPOOF 0x1000000 /* dynamic spoof, only opers see ip */
#define FLAGS_EXUNKNOWN 0x2000000 /* too many unknowns exit.. */
+/* flags for local clients, this needs stuff moved from above to here at some point */
+#define LFLAGS_SSL 0x00000001
+#define LFLAGS_FLUSH 0x00000002
+#define LFLAGS_CORK 0x00000004
+
/* umodes, settable flags */
/* lots of this moved to snomask -- jilles */
#define UMODE_SERVNOTICE 0x0001 /* server notices */
-#define UMODE_WALLOP 0x0100 /* send wallops to them */
-#define UMODE_OPERWALL 0x0200 /* Operwalls */
-#define UMODE_INVISIBLE 0x0400 /* makes user invisible */
-#define UMODE_CALLERID 0x2000 /* block unless caller id's */
-#define UMODE_LOCOPS 0x8000 /* show locops */
-#define UMODE_SERVICE 0x40000
-#define UMODE_DEAF 0x80000
-#define UMODE_NOFORWARD 0x400000 /* don't forward */
-#define UMODE_REGONLYMSG 0x800000 /* only allow logged in users to msg */
+#define UMODE_WALLOP 0x0002 /* send wallops to them */
+#define UMODE_OPERWALL 0x0004 /* Operwalls */
+#define UMODE_INVISIBLE 0x0008 /* makes user invisible */
+#define UMODE_CALLERID 0x0010 /* block unless caller id's */
+#define UMODE_LOCOPS 0x0020 /* show locops */
+#define UMODE_SERVICE 0x0040
+#define UMODE_DEAF 0x0080
+#define UMODE_NOFORWARD 0x0100 /* don't forward */
+#define UMODE_REGONLYMSG 0x0200 /* only allow logged in users to msg */
/* user information flags, only settable by remote mode or local oper */
-#define UMODE_OPER 0x100000 /* Operator */
-#define UMODE_ADMIN 0x200000 /* Admin on server */
-
-#define UMODE_ALL UMODE_SERVNOTICE
+#define UMODE_OPER 0x1000 /* Operator */
+#define UMODE_ADMIN 0x2000 /* Admin on server */
+#define UMODE_SSLCLIENT 0x4000 /* using SSL */
/* overflow flags */
/* EARLIER FLAGS ARE IN s_newconf.h */
-#define FLAGS2_EXEMPTRESV 0x0080000
-#define FLAGS2_EXEMPTGLINE 0x0100000
-#define FLAGS2_EXEMPTKLINE 0x0200000
-#define FLAGS2_EXEMPTFLOOD 0x0400000
-#define FLAGS2_NOLIMIT 0x0800000
-#define FLAGS2_IDLE_LINED 0x1000000
-#define FLAGS2_CLICAP 0x2000000
-#define FLAGS2_PING_COOKIE 0x4000000
-#define FLAGS2_IP_SPOOFING 0x8000000
-#define FLAGS2_FLOODDONE 0x10000000
+#define FLAGS2_EXEMPTRESV 0x00400000
+#define FLAGS2_EXEMPTKLINE 0x00800000
+#define FLAGS2_EXEMPTFLOOD 0x01000000
+#define FLAGS2_IP_SPOOFING 0x10000000
#define FLAGS2_EXEMPTSPAMBOT 0x20000000
#define FLAGS2_EXEMPTSHIDE 0x40000000
#define FLAGS2_EXEMPTJUPE 0x80000000
#define IsExUnknown(x) ((x)->flags & FLAGS_EXUNKNOWN)
#define SetExUnknown(x) ((x)->flags |= FLAGS_EXUNKNOWN)
+/* local flags */
+
+#define IsSSL(x) ((x)->localClient->localflags & LFLAGS_SSL)
+#define SetSSL(x) ((x)->localClient->localflags |= LFLAGS_SSL)
+#define ClearSSL(x) ((x)->localClient->localflags &= ~LFLAGS_SSL)
+
+#define IsFlush(x) ((x)->localClient->localflags & LFLAGS_FLUSH)
+#define SetFlush(x) ((x)->localClient->localflags |= LFLAGS_FLUSH)
+#define ClearFlush(x) ((x)->localClient->localflags &= ~LFLAGS_FLUSH)
+
/* oper flags */
#define MyOper(x) (MyConnect(x) && IsOper(x))
if (MyClient((x)) && !IsOper((x)) && !IsServer((x))) \
(x)->handler = CLIENT_HANDLER; }
-#define IsPrivileged(x) (IsOper(x) || IsServer(x))
-
/* umode flags */
#define IsInvisible(x) ((x)->umodes & UMODE_INVISIBLE)
#define SetInvisible(x) ((x)->umodes |= UMODE_INVISIBLE)
#define ClearInvisible(x) ((x)->umodes &= ~UMODE_INVISIBLE)
+#define IsSSLClient(x) ((x)->umodes & UMODE_SSLCLIENT)
+#define SetSSLClient(x) ((x)->umodes |= UMODE_SSLCLIENT)
+#define ClearSSLClient(x) ((x)->umodes &= ~UMODE_SSLCLIENT)
#define SendWallops(x) ((x)->umodes & UMODE_WALLOP)
-#define ClearWallops(x) ((x)->umodes &= ~UMODE_WALLOP)
#define SendLocops(x) ((x)->umodes & UMODE_LOCOPS)
#define SendServNotice(x) ((x)->umodes & UMODE_SERVNOTICE)
#define SendOperwall(x) ((x)->umodes & UMODE_OPERWALL)
-#define SetWallops(x) ((x)->umodes |= UMODE_WALLOP)
-#define SetCallerId(x) ((x)->umodes |= UMODE_CALLERID)
#define IsSetCallerId(x) ((x)->umodes & UMODE_CALLERID)
#define IsService(x) ((x)->umodes & UMODE_SERVICE)
#define IsDeaf(x) ((x)->umodes & UMODE_DEAF)
*/
#define IsExemptKline(x) ((x)->flags2 & FLAGS2_EXEMPTKLINE)
#define SetExemptKline(x) ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptLimits(x) ((x)->flags2 & FLAGS2_NOLIMIT)
-#define SetExemptLimits(x) ((x)->flags2 |= FLAGS2_NOLIMIT)
-#define IsExemptGline(x) ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x) ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
#define IsExemptFlood(x) ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
#define SetExemptFlood(x) ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
#define IsExemptSpambot(x) ((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
#define IsIPSpoof(x) ((x)->flags2 & FLAGS2_IP_SPOOFING)
#define SetIPSpoof(x) ((x)->flags2 |= FLAGS2_IP_SPOOFING)
-#define SetIdlelined(x) ((x)->flags2 |= FLAGS2_IDLE_LINED)
-#define IsIdlelined(x) ((x)->flags2 & FLAGS2_IDLE_LINED)
-
/* for local users: flood grace period is over
* for servers: mentioned in networknotice.c notice
*/
-#define IsFloodDone(x) ((x)->flags2 & FLAGS2_FLOODDONE)
-#define SetFloodDone(x) ((x)->flags2 |= FLAGS2_FLOODDONE)
+#define IsFloodDone(x) ((x)->flags & FLAGS_FLOODDONE)
+#define SetFloodDone(x) ((x)->flags |= FLAGS_FLOODDONE)
+
+/* These also operate on the uplink from which it came */
+#define IsCork(x) (MyConnect(x) ? (x)->localClient->cork_count : (x)->from->localClient->cork_count)
+#define SetCork(x) (MyConnect(x) ? (x)->localClient->cork_count++ : (x)->from->localClient->cork_count++ )
+#define ClearCork(x) (MyConnect(x) ? (x)->localClient->cork_count-- : (x)->from->localClient->cork_count--)
/*
* definitions for get_client_name
extern void check_banned_lines(void);
extern void check_klines_event(void *unused);
extern void check_klines(void);
-extern void check_glines(void);
extern void check_dlines(void);
extern void check_xlines(void);
extern client_t *find_named_person(const char *);
extern client_t *next_client(struct Client *, const char *);
-#define accept_message(s, t) ((s) == (t) || (dlinkFind((s), &((t)->localClient->allow_list))))
+#define accept_message(s, t) ((s) == (t) || (rb_dlinkFind((s), &((t)->localClient->allow_list))))
extern void del_all_accepts(struct Client *client_p);
extern void dead_link(struct Client *client_p);
extern void init_uid(void);
extern char *generate_uid(void);
+void allocate_away(struct Client *);
+void free_away(struct Client *);
+
#endif /* INCLUDED_client_h */
projects / irc / rqf / shadowircd.git / blobdiff