X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/54ac8b60a166683d6ed6fd1a2dadd5191873047a..a4721f5e9fd9dedc68534e736075a755645621f2:/include/client.h diff --git a/include/client.h b/include/client.h index 943098e6..0ecebc19 100644 --- a/include/client.h +++ b/include/client.h @@ -36,11 +36,11 @@ #include "ircd_defs.h" #include "channel.h" -#include "res.h" +#include "dns.h" #include "snomask.h" -#include "irc_string.h" -#include "sprintf_irc.h" +#include "match.h" #include "ircd.h" +#include "privilege.h" /* other structs */ struct Blacklist; @@ -53,6 +53,11 @@ struct Blacklist; #define IDLEN 10 +#define TGCHANGE_NUM 10 /* how many targets we keep track of */ +#define TGCHANGE_REPLY 5 /* how many reply targets */ +#define TGCHANGE_INITIAL 10 /* initial free targets (normal) */ +#define TGCHANGE_INITIAL_LOW 4 /* initial free targets (possible spambot) */ + /* * pre declare structs */ @@ -66,25 +71,8 @@ struct Server; struct LocalUser; struct AuthRequest; struct PreClient; -struct ListClient; struct scache_entry; -/* - * Atheme's coding standards require that we use BSD-style user-defined types - * for stuff. Fun! --nenolod - */ -typedef struct User user_t; -typedef struct Server server_t; -typedef struct Client client_t; -typedef struct LocalUser local_user_t; -typedef struct Listener listener_t; -typedef struct DNSReply dns_reply_t; -typedef struct Whowas whowas_entry_t; -typedef struct ConfItem conf_item_t; -typedef struct AuthRequest auth_request_t; -typedef struct PreClient pre_client_t; -typedef struct ListClient list_client_t; - /* * Client structures */ @@ -100,7 +88,7 @@ struct User struct Server { - user_t *user; /* who activated this connection */ + struct User *user; /* who activated this connection */ char by[NICKLEN]; rb_dlink_list servers; rb_dlink_list users; @@ -109,25 +97,12 @@ struct Server 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; }; @@ -136,12 +111,12 @@ struct Client { 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 */ - client_t *from; /* == self, if Local Client, *NEVER* NULL! */ + struct User *user; /* ...defined, if this is a User */ + struct Server *serv; /* ...defined, if this is a server */ + struct Client *servptr; /* Points to server this Client is on */ + struct Client *from; /* == self, if Local Client, *NEVER* NULL! */ - whowas_entry_t *whowas; /* Pointers to whowas structs */ + struct Whowas *whowas; /* Pointers to whowas structs */ time_t tsinfo; /* TS on the nick, SVINFO on server */ unsigned int umodes; /* opers, normal users subset */ unsigned int flags; /* client flags */ @@ -157,10 +132,10 @@ struct Client /* client->name is the unique name for a client nick or host */ char name[HOSTLEN + 1]; - /* - * client->username is the username from ident or the USER message, - * If the client is idented the USER message is ignored, otherwise - * the username part of the USER message is put here prefixed with a + /* + * client->username is the username from ident or the USER message, + * If the client is idented the USER message is ignored, otherwise + * the username part of the USER message is put here prefixed with a * tilde depending on the I:line, Once a client has registered, this * field should be considered read-only. */ @@ -182,8 +157,15 @@ struct Client */ rb_dlink_list on_allow_list; - local_user_t *localClient; - pre_client_t *preClient; + time_t first_received_message_time; + int received_number_of_privmsgs; + int flood_noticed; + + struct LocalUser *localClient; + struct PreClient *preClient; + + time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */ + char *certfp; /* client certificate fingerprint */ }; struct LocalUser @@ -194,18 +176,15 @@ struct LocalUser * (directly connected to *this* server with a socket. */ /* Anti flooding part, all because of lamers... */ - time_t last_join_time; /* when this client last + time_t last_join_time; /* when this client last joined a channel */ - time_t last_leave_time; /* when this client last + time_t last_leave_time; /* when this client last * left a channel */ - int join_leave_count; /* count of JOIN/LEAVE in less than + int join_leave_count; /* count of JOIN/LEAVE in less than MIN_JOIN_LEAVE_TIME seconds */ - int oper_warn_count_down; /* warn opers of this possible + 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 */ @@ -217,10 +196,10 @@ struct LocalUser * we want to use unsigned int here so the sizes have a better chance of * staying the same on 64 bit machines. The current trend is to use * I32LP64, (32 bit ints, 64 bit longs and pointers) and since ircd - * will NEVER run on an operating system where ints are less than 32 bits, + * will NEVER run on an operating system where ints are less than 32 bits, * it's a relatively safe bet to use ints. Since right shift operations are - * performed on these, it's not safe to allow them to become negative, - * which is possible for long running server connections. Unsigned values + * performed on these, it's not safe to allow them to become negative, + * which is possible for long running server connections. Unsigned values * generally overflow gracefully. --Bleep */ unsigned int sendM; /* Statistics: protocol messages send */ @@ -229,11 +208,11 @@ struct LocalUser unsigned int receiveK; /* Statistics: total k-bytes received */ unsigned short sendB; /* counters to count upto 1-k lots of bytes */ unsigned short receiveB; /* sent and received. */ - listener_t *listener; /* listener accepted from */ - conf_item_t *att_conf; /* attached conf */ + struct Listener *listener; /* listener accepted from */ + struct ConfItem *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,9 +223,11 @@ 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; + char *cipher_string; int caps; /* capabilities bit-field */ rb_fde_t *F; /* >= 0, for local clients */ @@ -254,19 +235,9 @@ struct LocalUser /* 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; - - time_t last_away; /* Away since... */ + time_t next_away; /* Don't allow next away before... */ time_t last; + uint32_t connid; /* clients allowed to talk through +g */ rb_dlink_list allow_list; @@ -280,22 +251,40 @@ struct LocalUser * to avoid flooding. * -- adrian */ - int allow_read; /* how many we're allowed to read in this second */ - int actually_read; /* how many we've actually read in this second */ int sent_parsed; /* how many messages we've parsed in this second */ time_t last_knock; /* time of last knock */ unsigned long random_ping; - auth_request_t *auth_request; + struct AuthRequest *auth_request; /* target change stuff */ - uint32_t targets[10]; /* targets were aware of (fnv32(use_id(target_p))) */ - unsigned int targinfo[2]; /* cyclic array, no in use */ + /* targets we're aware of (fnv32(use_id(target_p))): + * 0..TGCHANGE_NUM-1 regular slots + * TGCHANGE_NUM..TGCHANGE_NUM+TGCHANGE_REPLY-1 reply slots + */ + uint32_t targets[TGCHANGE_NUM + TGCHANGE_REPLY]; + unsigned int targets_free; /* free targets */ time_t target_last; /* last time we cleared a slot */ - list_client_t *safelist_data; + /* ratelimit items */ + time_t ratelimit; + unsigned int join_who_credits; 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 zconnid; + 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... */ + + char sasl_agent[IDLEN]; + unsigned char sasl_out; + unsigned char sasl_complete; }; struct PreClient @@ -304,28 +293,10 @@ struct PreClient char spoofuser[USERLEN + 1]; char spoofhost[HOSTLEN + 1]; - char sasl_agent[IDLEN]; - unsigned char sasl_out; - unsigned char sasl_complete; - rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */ struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */ -}; - -struct ListClient -{ - unsigned int hash_indice; - unsigned int users_min, users_max; - - /* It would be nice to add other modifiers, - * but not for 1.1 --nenolod - */ -}; -struct exit_client_hook -{ - struct Client *client_p; - char exit_message[TOPICLEN]; + struct rb_sockaddr_storage lip; /* address of our side of the connection */ }; /* @@ -390,12 +361,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) @@ -419,43 +385,45 @@ struct exit_client_hook #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_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 */ +#define FLAGS_TGEXCESSIVE 0x1000000 /* whether the client has attemped to change targets excessively fast */ + +/* 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_EXTENDCHANS 0x00200000 #define FLAGS2_EXEMPTRESV 0x00400000 -#define FLAGS2_EXEMPTGLINE 0x00800000 -#define FLAGS2_EXEMPTKLINE 0x01000000 -#define FLAGS2_EXEMPTFLOOD 0x02000000 +#define FLAGS2_EXEMPTKLINE 0x00800000 +#define FLAGS2_EXEMPTFLOOD 0x01000000 #define FLAGS2_IP_SPOOFING 0x10000000 #define FLAGS2_EXEMPTSPAMBOT 0x20000000 #define FLAGS2_EXEMPTSHIDE 0x40000000 @@ -465,8 +433,15 @@ struct exit_client_hook UMODE_WALLOP | UMODE_LOCOPS) #define DEFAULT_OPER_SNOMASK SNO_GENERAL -#define CLICAP_MULTI_PREFIX 0x0001 -#define CLICAP_SASL 0x0002 +#define CLICAP_MULTI_PREFIX 0x0001 +#define CLICAP_SASL 0x0002 +#define CLICAP_ACCOUNT_NOTIFY 0x0004 +#define CLICAP_EXTENDED_JOIN 0x0008 +#define CLICAP_AWAY_NOTIFY 0x0010 +#define CLICAP_TLS 0x0020 +#define CLICAP_USERHOST_IN_NAMES 0x0040 +#define CLICAP_CAP_NOTIFY 0x0080 +#define CLICAP_CHGHOST 0x0100 /* * flags macros. @@ -501,8 +476,19 @@ 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) +#define IsTGExcessive(x) ((x)->flags & FLAGS_TGEXCESSIVE) +#define SetTGExcessive(x) ((x)->flags |= FLAGS_TGEXCESSIVE) +#define ClearTGExcessive(x) ((x)->flags &= ~FLAGS_TGEXCESSIVE) + +/* 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)) @@ -518,6 +504,9 @@ struct exit_client_hook #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 SendLocops(x) ((x)->umodes & UMODE_LOCOPS) #define SendServNotice(x) ((x)->umodes & UMODE_SERVNOTICE) @@ -536,8 +525,6 @@ struct exit_client_hook */ #define IsExemptKline(x) ((x)->flags2 & FLAGS2_EXEMPTKLINE) #define SetExemptKline(x) ((x)->flags2 |= FLAGS2_EXEMPTKLINE) -#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) @@ -550,6 +537,8 @@ struct exit_client_hook #define SetExemptResv(x) ((x)->flags2 |= FLAGS2_EXEMPTRESV) #define IsIPSpoof(x) ((x)->flags2 & FLAGS2_IP_SPOOFING) #define SetIPSpoof(x) ((x)->flags2 |= FLAGS2_IP_SPOOFING) +#define IsExtendChans(x) ((x)->flags2 & FLAGS2_EXTENDCHANS) +#define SetExtendChans(x) ((x)->flags2 |= FLAGS2_EXTENDCHANS) /* for local users: flood grace period is over * for servers: mentioned in networknotice.c notice @@ -557,6 +546,11 @@ struct exit_client_hook #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 */ @@ -567,16 +561,15 @@ 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 void resv_nick_fnc(const char *mask, const char *reason, int temp_time); 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); -extern client_t *make_client(struct Client *from); +extern struct Client *make_client(struct Client *from); extern void free_pre_client(struct Client *client); extern void free_client(struct Client *client); @@ -589,27 +582,30 @@ extern void error_exit_client(struct Client *, int); extern void count_local_client_memory(size_t * count, size_t * memory); extern void count_remote_client_memory(size_t * count, size_t * memory); -extern client_t *find_chasing(struct Client *, const char *, int *); -extern client_t *find_person(const char *); -extern client_t *find_named_person(const char *); -extern client_t *next_client(struct Client *, const char *); +extern int clean_nick(const char *, int loc_client); + +extern struct Client *find_chasing(struct Client *, const char *, int *); +extern struct Client *find_person(const char *); +extern struct Client *find_named_person(const char *); +extern struct Client *next_client(struct Client *, const char *); #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); +extern int show_ip_conf(struct ConfItem *aconf, struct Client *source_p); +extern int show_ip_whowas(struct Whowas *whowas, struct Client *source_p); extern void initUser(void); extern void free_user(struct User *, struct Client *); -extern user_t *make_user(struct Client *); -extern server_t *make_server(struct Client *); +extern struct User *make_user(struct Client *); +extern struct Server *make_server(struct Client *); extern void close_connection(struct Client *); extern void init_uid(void); extern char *generate_uid(void); -void allocate_away(struct Client *); +void allocate_away(struct Client *); void free_away(struct Client *); #endif /* INCLUDED_client_h */