X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/66c8fdd207e5ca29445ea4892f197a2ac1f24840..e36c166d4959b0db327c62dfea13ba4fab639b17:/include/client.h diff --git a/include/client.h b/include/client.h index 3065c21..13bd096 100644 --- a/include/client.h +++ b/include/client.h @@ -35,14 +35,12 @@ #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" +#include "privilege.h" /* other structs */ struct Blacklist; @@ -69,6 +67,7 @@ struct LocalUser; struct AuthRequest; struct PreClient; struct ListClient; +struct scache_entry; /* * Atheme's coding standards require that we use BSD-style user-defined types @@ -91,8 +90,8 @@ typedef struct ListClient list_client_t; */ 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 */ @@ -103,39 +102,27 @@ struct Server { 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 SlinkRpl -{ - int command; - int datalen; - int gotdatalen; - int readdata; - unsigned char *data; + struct scache_entry *nameinfo; }; 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 */ @@ -180,15 +167,21 @@ struct Client /* 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; + + time_t first_received_message_time; + int received_number_of_privmsgs; + int flood_noticed; local_user_t *localClient; pre_client_t *preClient; + + time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */ }; 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. @@ -203,9 +196,6 @@ struct LocalUser int oper_warn_count_down; /* warn opers of this possible spambot every time this gets to 0 */ time_t last_caller_id_time; - time_t first_received_message_time; - int received_number_of_privmsgs; - int flood_noticed; time_t lasttime; /* last time we parsed something */ time_t firsttime; /* time client was created */ @@ -233,7 +223,7 @@ struct LocalUser 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; @@ -244,35 +234,27 @@ struct LocalUser * agreed. lets get rid of it someday! --nenolod */ char *passwd; + char *auth_user; char *opername; /* name of operator{} block being used or tried (challenge) */ char *challenge; 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 @@ -288,7 +270,7 @@ struct LocalUser 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 */ @@ -296,6 +278,15 @@ struct LocalUser 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 */ + struct _ssl_ctl *z_ctl; /* second ctl for ssl+zlib */ + uint32_t localflags; + struct ZipStats *zipstats; /* zipstats */ + uint16_t cork_count; /* used for corking/uncorking connections */ + struct ev_entry *event; /* used for associated events */ + + struct PrivilegeSet *privset; /* privset... */ }; struct PreClient @@ -308,8 +299,10 @@ 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 */ + + struct rb_sockaddr_storage lip; /* address of our side of the connection */ }; struct ListClient @@ -322,12 +315,6 @@ struct ListClient */ }; -struct exit_client_hook -{ - struct Client *client_p; - char exit_message[TOPICLEN]; -}; - /* * status macros. */ @@ -390,12 +377,7 @@ struct exit_client_hook * 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) @@ -413,54 +395,50 @@ struct exit_client_hook #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_CHKACCESS 0x0040 /* ok to check clients access if set */ +#define FLAGS_PING_COOKIE 0x0040 /* has sent ping cookie */ #define FLAGS_GOTID 0x0080 /* successful ident lookup achieved */ -#define FLAGS_NEEDID 0x0100 /* I-lines say must use ident return */ +#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_MARK 0x20000 /* marked client */ -#define FLAGS_HIDDEN 0x40000 /* hidden server */ -#define FLAGS_EOB 0x80000 /* EOB */ -#define FLAGS_MYCONNECT 0x100000 /* MyConnect */ -#define FLAGS_IOERROR 0x200000 /* IO error */ -#define FLAGS_SERVICE 0x400000 /* network service */ -#define FLAGS_TGCHANGE 0x800000 /* we're allowed to clear something */ -#define FLAGS_DYNSPOOF 0x1000000 /* dynamic spoof, only opers see ip */ -#define FLAGS_EXUNKNOWN 0x2000000 /* too many unknowns exit.. */ +#define FLAGS_MARK 0x10000 /* marked client */ +#define FLAGS_HIDDEN 0x20000 /* hidden server */ +#define FLAGS_EOB 0x40000 /* EOB */ +#define FLAGS_MYCONNECT 0x80000 /* MyConnect */ +#define FLAGS_IOERROR 0x100000 /* IO error */ +#define FLAGS_SERVICE 0x200000 /* network service */ +#define FLAGS_TGCHANGE 0x400000 /* we're allowed to clear something */ +#define FLAGS_DYNSPOOF 0x800000 /* dynamic spoof, only opers see ip */ + +/* 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 @@ -469,8 +447,6 @@ struct exit_client_hook UMODE_WALLOP | UMODE_LOCOPS) #define DEFAULT_OPER_SNOMASK SNO_GENERAL -#define FLAGS_ID (FLAGS_NEEDID | FLAGS_GOTID) - #define CLICAP_MULTI_PREFIX 0x0001 #define CLICAP_SASL 0x0002 @@ -478,9 +454,6 @@ struct exit_client_hook * flags macros. */ #define IsPerson(x) (IsClient(x) && (x)->user != NULL) -#define DoAccess(x) ((x)->flags & FLAGS_CHKACCESS) -#define SetAccess(x) ((x)->flags |= FLAGS_CHKACCESS) -#define ClearAccess(x) ((x)->flags &= ~FLAGS_CHKACCESS) #define HasServlink(x) ((x)->flags & FLAGS_SERVLINK) #define SetServlink(x) ((x)->flags |= FLAGS_SERVLINK) #define MyConnect(x) ((x)->flags & FLAGS_MYCONNECT) @@ -510,8 +483,16 @@ struct exit_client_hook #define IsDynSpoof(x) ((x)->flags & FLAGS_DYNSPOOF) #define SetDynSpoof(x) ((x)->flags |= FLAGS_DYNSPOOF) #define ClearDynSpoof(x) ((x)->flags &= ~FLAGS_DYNSPOOF) -#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)) @@ -523,28 +504,23 @@ struct exit_client_hook 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 IsNoForward(x) ((x)->umodes & UMODE_NOFORWARD) #define IsSetRegOnlyMsg(x) ((x)->umodes & UMODE_REGONLYMSG) -#define SetNeedId(x) ((x)->flags |= FLAGS_NEEDID) -#define IsNeedId(x) (((x)->flags & FLAGS_NEEDID) != 0) - #define SetGotId(x) ((x)->flags |= FLAGS_GOTID) #define IsGotId(x) (((x)->flags & FLAGS_GOTID) != 0) @@ -553,10 +529,6 @@ struct exit_client_hook */ #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) @@ -570,14 +542,16 @@ struct exit_client_hook #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 @@ -589,12 +563,10 @@ struct exit_client_hook 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 const char *get_client_name(struct Client *client, int show_ip); -extern const char *get_server_name(struct Client *client, int show_ip); extern const char *log_client_name(struct Client *, int); extern int is_remote_connect(struct Client *); extern void init_client(void); @@ -616,10 +588,10 @@ extern client_t *find_person(const char *); 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 dead_link(struct Client *client_p, int sendqex); extern int show_ip(struct Client *source_p, struct Client *target_p); extern int show_ip_conf(struct ConfItem *aconf, struct Client *target_p); @@ -631,4 +603,7 @@ extern void close_connection(struct Client *); extern void init_uid(void); extern char *generate_uid(void); +void allocate_away(struct Client *); +void free_away(struct Client *); + #endif /* INCLUDED_client_h */