#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
*/
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
*/
{
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 */
char suser[NICKLEN+1];
- struct Dictionary *metadata;
};
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;
double out_ratio;
};
-struct MetadataEntry
-{
- char key[METADATAKEYLEN];
- char value[METADATAVALUELEN];
-};
-
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 */
int received_number_of_privmsgs;
int flood_noticed;
- local_user_t *localClient;
- pre_client_t *preClient;
+ 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
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 rb_sockaddr_storage ip;
* 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 dummy1;
+ int dummy0;
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;
+ struct ListClient *safelist_data;
char *mangledhost; /* non-NULL if host mangling module loaded and
applicable to this client */
{
unsigned int hash_indice;
unsigned int users_min, users_max;
-
- /* It would be nice to add other modifiers,
- * but not for 1.1 --nenolod
- */
+ time_t created_min, created_max, topic_min, topic_max;
+ int operspy;
};
/*
#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_MARK 0x10000 /* marked client */
#define FLAGS_HIDDEN 0x20000 /* hidden server */
#define FLAGS_EOB 0x40000 /* EOB */
#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 CLICAP_MULTI_PREFIX 0x0001
#define CLICAP_SASL 0x0002
-#define CLICAP_PRESENCE 0x0004
+#define CLICAP_ACCOUNT_NOTIFY 0x0004
+#define CLICAP_EXTENDED_JOIN 0x0008
/*
* flags macros.
#define IsDynSpoof(x) ((x)->flags & FLAGS_DYNSPOOF)
#define SetDynSpoof(x) ((x)->flags |= FLAGS_DYNSPOOF)
#define ClearDynSpoof(x) ((x)->flags &= ~FLAGS_DYNSPOOF)
+#define IsTGExcessive(x) ((x)->flags & FLAGS_TGEXCESSIVE)
+#define SetTGExcessive(x) ((x)->flags |= FLAGS_TGEXCESSIVE)
+#define ClearTGExcessive(x) ((x)->flags &= ~FLAGS_TGEXCESSIVE)
/* local flags */
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);
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 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 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 free_away(struct Client *);
-const char *get_metadata(struct Client *, const char *);
-void set_metadata(struct Client *, const char *, const char *);
-void delete_metadata(struct Client *, const char *);
-
#endif /* INCLUDED_client_h */
projects / solanum.git / blobdiff