X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/157ce145856ad1620b724a7ad32ea70b6b8ed202..refs/tags/1.9:/src/hash.h?ds=sidebyside diff --git a/src/hash.h b/src/hash.h index 67748f4..42112de 100644 --- a/src/hash.h +++ b/src/hash.h @@ -56,28 +56,36 @@ #define MODE_ADMINSONLY 0x10000000 /* +a Admins only */ #define MODE_REMOVE 0x80000000 -#define FLAGS_OPER 0x000001 /* Operator +O */ -#define FLAGS_LOCOP 0x000002 /* Local operator +o */ -#define FLAGS_INVISIBLE 0x000004 /* invisible +i */ -#define FLAGS_WALLOP 0x000008 /* receives wallops +w */ -#define FLAGS_DUMMY 0x000010 /* user is not announced to other servers */ -#define FLAGS_DEAF 0x000020 /* deaf +d */ -#define FLAGS_SERVICE 0x000040 /* cannot be kicked, killed or deoped +k */ -#define FLAGS_GLOBAL 0x000080 /* receives global messages +g */ -#define FLAGS_SETHOST 0x000100 /* sethost +h */ -#define FLAGS_PERSISTENT 0x000200 /* for reserved nicks, this isn't just one-shot */ -#define FLAGS_GAGGED 0x000400 /* for gagged users */ -#define FLAGS_AWAY 0x000800 /* for away users */ -#define FLAGS_STAMPED 0x001000 /* for users who have been stamped */ -#define FLAGS_HIDDEN_HOST 0x002000 /* user's host is masked by their account */ -#define FLAGS_REGNICK 0x004000 /* user owns their current nick */ -#define FLAGS_REGISTERING 0x008000 /* user has issued account register command, is waiting for email cookie */ -#define FLAGS_BOT 0x010000 /* Bot +B */ -#define FLAGS_HIDECHANS 0x020000 /* Hidden channels +n */ -#define FLAGS_HIDEIDLE 0x040000 /* Hidden idle time +I */ -#define FLAGS_XTRAOP 0x080000 /* Hidden idle time */ -#define FLAGS_CLOAKHOST 0x100000 /* user has cloaked host */ -#define FLAGS_CLOAKIP 0x200000 /* user has cloaked ip */ +#define FLAGS_OPER 0x00000001 /* Operator +o */ +#define FLAGS_LOCOP 0x00000002 /* Local operator +O */ +#define FLAGS_INVISIBLE 0x00000004 /* invisible +i */ +#define FLAGS_WALLOP 0x00000008 /* receives wallops +w */ +#define FLAGS_DUMMY 0x00000010 /* user is not announced to other servers */ +#define FLAGS_DEAF 0x00000020 /* deaf +d */ +#define FLAGS_SERVICE 0x00000040 /* cannot be kicked, killed or deoped +k */ +#define FLAGS_GLOBAL 0x00000080 /* receives global messages +g */ +#define FLAGS_SETHOST 0x00000100 /* sethost +h */ +#define FLAGS_PERSISTENT 0x00000200 /* for reserved nicks, this isn't just one-shot */ +#define FLAGS_GAGGED 0x00000400 /* for gagged users */ +#define FLAGS_AWAY 0x00000800 /* for away users */ +#define FLAGS_STAMPED 0x00001000 /* for users who have been stamped */ +#define FLAGS_HIDDEN_HOST 0x00002000 /* user's host is masked by their account +x */ +#define FLAGS_REGNICK 0x00004000 /* user owns their current nick */ +#define FLAGS_REGISTERING 0x00008000 /* user has issued account register command, is waiting for email cookie */ +#define FLAGS_BOT 0x00010000 /* Bot +B */ +#define FLAGS_HIDECHANS 0x00020000 /* Hidden channels +n */ +#define FLAGS_HIDEIDLE 0x00040000 /* Hidden idle time +I */ +#define FLAGS_XTRAOP 0x00080000 /* user is XtraOP +X */ +#define FLAGS_CLOAKHOST 0x00100000 /* user has cloaked host +C */ +#define FLAGS_CLOAKIP 0x00200000 /* user has cloaked ip +c */ +#define FLAGS_ADMIN 0x00400000 /* Admin +a */ +#define FLAGS_SSL 0x00800000 /* user is using a secure connection +z */ +#define FLAGS_PRIVDEAF 0x01000000 /* user is deaf to private messages +D */ +#define FLAGS_ACCOUNTONLY 0x02000000 /* user only receives PMs from authed users +R */ +#define FLAGS_WHOIS 0x04000000 /* user receives notices when /whois'ed +W */ +#define FLAGS_HIDEOPER 0x08000000 /* user is a hidden IRCop +H */ +#define FLAGS_NOLINK 0x10000000 /* user has opted out of channel redirection +L */ +#define FLAGS_COMMONCHANSONLY 0x20000000 /* user only receives PMs from users on same cahnnels +q */ #define IsOper(x) ((x)->modes & FLAGS_OPER) #define IsService(x) ((x)->modes & FLAGS_SERVICE) @@ -100,10 +108,18 @@ #define IsDummy(x) ((x)->modes & FLAGS_DUMMY) #define IsFakeHost(x) ((x)->fakehost[0] != '\0') #define IsLocal(x) ((x)->uplink == self) +#define IsAdmin(x) ((x)->modes & FLAGS_ADMIN) +#define IsSSL(x) ((x)->modes & FLAGS_SSL) +#define IsPrivDeaf(x) ((x)->modes & FLAGS_PRIVDEAF) +#define IsAccountOnly(x) ((x)->modes & FLAGS_ACCOUNTONLY) +#define IsWhoisNotice(x) ((x)->modes & FLAGS_WHOIS) +#define IsHideOper(x) ((x)->modes & FLAGS_HIDEOPER) +#define IsNoRedirect(x) ((x)->modes & FLAGS_NOLINK) +#define IsCommonChansOnly(x) ((x)->modes & FLAGS_COMMONCHANSONLY) #define NICKLEN 30 #define USERLEN 10 -#define HOSTLEN 63 +#define HOSTLEN 75 #define SOCKIPLEN 45 #define ACCOUNTLEN 15 #define REALLEN 50 @@ -228,6 +244,7 @@ struct userNode { char *mark; /* only filled if they are marked */ char *version_reply; /* only filled in if a version query was triggered */ + char *sslfp; /* only filled in if a mark SSLCLIFP is received */ time_t timestamp; /* Time of last nick change */ time_t idle_since; @@ -378,6 +395,11 @@ typedef int (*server_link_func_t) (struct server *server, void *extra); void reg_server_link_func(server_link_func_t handler, void *extra); void call_server_link_funcs(struct server *server); +typedef void (*sasl_input_func_t) (struct server* source ,const char *identifier, const char *subcmd, const char *data, const char *ext, void *extra); +void reg_sasl_input_func(sasl_input_func_t handler, void *extra); +void call_sasl_input_func(struct server* source ,const char *identifier, const char *subcmd, const char *data, const char *ext); +void unreg_sasl_input_func(sasl_input_func_t handler, void *extra); + typedef int (*new_user_func_t) (struct userNode *user, void *extra); void reg_new_user_func(new_user_func_t handler, void *extra); void call_new_user_funcs(struct userNode *user); @@ -402,8 +424,8 @@ typedef void (*new_channel_func_t) (struct chanNode *chan, void *extra); void reg_new_channel_func(new_channel_func_t handler, void *extra); typedef int (*join_func_t) (struct modeNode *mNode, void *extra); void reg_join_func(join_func_t handler, void *extra); -typedef void (*del_channel_func_t) (struct chanNode *chan); -void reg_del_channel_func(del_channel_func_t handler); +typedef void (*del_channel_func_t) (struct chanNode *chan, void *extra); +void reg_del_channel_func(del_channel_func_t handler, void *extra); struct chanNode* AddChannel(const char *name, time_t time_, const char *modes, char *banlist, char *exemptlist); void LockChannel(struct chanNode *channel); @@ -411,14 +433,14 @@ void UnlockChannel(struct chanNode *channel); struct modeNode* AddChannelUser(struct userNode* user, struct chanNode* channel); -typedef void (*part_func_t) (struct modeNode *mn, const char *reason); -void reg_part_func(part_func_t handler); -void unreg_part_func(part_func_t handler); +typedef void (*part_func_t) (struct modeNode *mn, const char *reason, void *extra); +void reg_part_func(part_func_t handler, void *extra); +void unreg_part_func(part_func_t handler, void *extra); void DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reason, int deleting); void KickChannelUser(struct userNode* target, struct chanNode* channel, struct userNode *kicker, const char *why); -typedef void (*kick_func_t) (struct userNode *kicker, struct userNode *user, struct chanNode *chan); -void reg_kick_func(kick_func_t handler); +typedef void (*kick_func_t) (struct userNode *kicker, struct userNode *user, struct chanNode *chan, void *extra); +void reg_kick_func(kick_func_t handler, void *extra); void ChannelUserKicked(struct userNode* kicker, struct userNode* victim, struct chanNode* channel); int ChannelBanExists(struct chanNode *channel, const char *ban);