#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 "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 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 */
- fde_t *F; /* >= 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
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 */
};
#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 */
/* 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_SSLCLIENT 0x400000 /* using SSL */
#define UMODE_ALL UMODE_SERVNOTICE
#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))
#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 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 */