X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fhash.h;h=da4b40f53b2a9628e88189078ef481a360b7354f;hb=HEAD;hp=41d3efdd2253ea6b03ba271d7f4f7f15466c6f4b;hpb=b291dd8594acb24d9f92c8ef9595543ca4aa5e8b;p=srvx.git diff --git a/src/hash.h b/src/hash.h index 41d3efd..da4b40f 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,5 +1,5 @@ /* hash.h - IRC network state database - * Copyright 2000-2004 srvx Development Team + * Copyright 2000-2006 srvx Development Team * * This file is part of srvx. * @@ -25,67 +25,93 @@ #include "dict.h" #include "policer.h" -#define MODE_CHANOP 0x0001 /* +o USER */ -#define MODE_VOICE 0x0002 /* +v USER */ -#define MODE_PRIVATE 0x0004 /* +p */ -#define MODE_SECRET 0x0008 /* +s */ -#define MODE_MODERATED 0x0010 /* +m */ -#define MODE_TOPICLIMIT 0x0020 /* +t */ -#define MODE_INVITEONLY 0x0040 /* +i */ -#define MODE_NOPRIVMSGS 0x0080 /* +n */ -#define MODE_KEY 0x0100 /* +k KEY */ -#define MODE_BAN 0x0200 /* +b BAN */ -#define MODE_LIMIT 0x0400 /* +l LIMIT */ -#define MODE_DELAYJOINS 0x0800 /* +D */ -#define MODE_REGONLY 0x1000 /* ircu +r, Bahamut +R */ -#define MODE_NOCOLORS 0x2000 /* +c */ -#define MODE_NOCTCPS 0x4000 /* +C */ -#define MODE_REGISTERED 0x8000 /* Bahamut +r */ -#define MODE_REMOVE 0x80000000 - -#define FLAGS_OPER 0x0001 /* Operator +O */ -#define FLAGS_LOCOP 0x0002 /* Local operator +o */ -#define FLAGS_INVISIBLE 0x0004 /* invisible +i */ -#define FLAGS_WALLOP 0x0008 /* receives wallops +w */ -#define FLAGS_SERVNOTICE 0x0010 /* receives server notices +s */ -#define FLAGS_DEAF 0x0020 /* deaf +d */ -#define FLAGS_SERVICE 0x0040 /* cannot be kicked, killed or deoped +k */ -#define FLAGS_GLOBAL 0x0080 /* receives global messages +g */ -#define FLAGS_HELPER 0x0100 /* (network?) helper +h */ -#define FLAGS_PERSISTENT 0x0200 /* for reserved nicks, this isn't just one-shot */ -#define FLAGS_GAGGED 0x0400 /* for gagged users */ -#define FLAGS_AWAY 0x0800 /* for away users */ -#define FLAGS_STAMPED 0x1000 /* for users who have been stamped */ -#define FLAGS_HIDDEN_HOST 0x2000 /* user's host is masked by their account */ -#define FLAGS_REGNICK 0x4000 /* user owns their current nick */ -#define FLAGS_REGISTERING 0x8000 /* user has issued accnt register command, is waiting for email cookie */ +#define MODE_CHANOP 0x0001 /* +o USER */ +#define MODE_VOICE 0x0002 /* +v USER */ +#define MODE_PRIVATE 0x0004 /* +p */ +#define MODE_SECRET 0x0008 /* +s */ +#define MODE_MODERATED 0x0010 /* +m */ +#define MODE_TOPICLIMIT 0x0020 /* +t */ +#define MODE_INVITEONLY 0x0040 /* +i */ +#define MODE_NOPRIVMSGS 0x0080 /* +n */ +#define MODE_KEY 0x0100 /* +k KEY */ +#define MODE_BAN 0x0200 /* +b BAN */ +#define MODE_LIMIT 0x0400 /* +l LIMIT */ +#define MODE_DELAYJOINS 0x0800 /* +D */ +#define MODE_REGONLY 0x1000 /* ircu +r, Bahamut +R */ +#define MODE_NOCOLORS 0x2000 /* +c */ +#define MODE_NOCTCPS 0x4000 /* +C */ +#define MODE_REGISTERED 0x8000 /* Bahamut +r */ +#define MODE_APASS 0x10000 /* +A adminpass */ +#define MODE_UPASS 0x20000 /* +U userpass */ +#define MODE_NONOTICES 0x40000 /* +N */ +#define MODE_NOAMSGS 0x80000 /* +M */ +#define MODE_ALTCHAN 0x100000 /* +F */ +#define MODE_ACCESS 0x200000 /* +a */ +#define MODE_NOFLOOD 0x400000 /* +f */ +#define MODE_AUDITORIUM 0x800000 /* +u */ +#define MODE_SSLCHAN 0x1000000 /* +S */ +#define MODE_REMOVE 0x80000000 + +#define FLAGS_OPER 0x0001 /* +o global operator */ +#define FLAGS_INVISIBLE 0x0004 /* +i invisible */ +#define FLAGS_WALLOP 0x0008 /* +w receives wallops */ +#define FLAGS_DEAF 0x0020 /* +d deaf */ +#define FLAGS_SERVICE 0x0040 /* +k cannot be kicked, killed or deoped */ +#define FLAGS_GLOBAL 0x0080 /* +g receives global messages */ +#define FLAGS_NOCHAN 0x0100 /* +n hide channels in whois */ +#define FLAGS_PERSISTENT 0x0200 /* for reserved nicks, this isn't just one-shot */ +#define FLAGS_GAGGED 0x0400 /* for gagged users */ +#define FLAGS_AWAY 0x0800 /* for away users */ +#define FLAGS_STAMPED 0x1000 /* for users who have been stamped */ +#define FLAGS_HIDDEN_HOST 0x2000 /* +x user's host is masked by their account */ +#define FLAGS_REGNICK 0x4000 /* +r user owns their current nick */ +#define FLAGS_REGISTERING 0x8000 /* user has issued account register command, is waiting for email cookie */ +#define FLAGS_DUMMY 0x10000 /* user is not announced to other servers */ +#define FLAGS_NOIDLE 0x20000 /* +I hide idle time in whois */ +#define FLAGS_NETSERV 0x40000 /* +S */ +#define FLAGS_SECURITYSERV 0x80000 /* +D */ +#define FLAGS_XTRAOP 0x100000 /* +X */ +#define FLAGS_HIDDENOPER 0x200000 /* +H */ +#define FLAGS_SERVERNOTICE 0x400000 /* +s */ +#define FLAGS_SEENOIDLE 0x800000 /* +t */ #define IsOper(x) ((x)->modes & FLAGS_OPER) #define IsService(x) ((x)->modes & FLAGS_SERVICE) #define IsDeaf(x) ((x)->modes & FLAGS_DEAF) #define IsInvisible(x) ((x)->modes & FLAGS_INVISIBLE) #define IsGlobal(x) ((x)->modes & FLAGS_GLOBAL) +#define IsNoChan(x) ((x)->modes & FLAGS_NOCHAN) #define IsWallOp(x) ((x)->modes & FLAGS_WALLOP) -#define IsServNotice(x) ((x)->modes & FLAGS_SERVNOTICE) -#define IsHelperIrcu(x) ((x)->modes & FLAGS_HELPER) #define IsGagged(x) ((x)->modes & FLAGS_GAGGED) -#define IsPersistent(x) ((x)->modes & FLAGS_PERSISTENT) +#define IsPersistent(x) ((x)->modes & FLAGS_PERSISTENT) #define IsAway(x) ((x)->modes & FLAGS_AWAY) #define IsStamped(x) ((x)->modes & FLAGS_STAMPED) #define IsHiddenHost(x) ((x)->modes & FLAGS_HIDDEN_HOST) #define IsReggedNick(x) ((x)->modes & FLAGS_REGNICK) -#define IsRegistering(x) ((x)->modes & FLAGS_REGISTERING) +#define IsRegistering(x) ((x)->modes & FLAGS_REGISTERING) +#define IsDummy(x) ((x)->modes & FLAGS_DUMMY) +#define IsNoIdle(x) ((x)->modes & FLAGS_NOIDLE) +#define IsSecurityServ(x) ((x)->modes & FLAGS_SECURITYSERV) +#define IsNetServ(x) ((x)->modes & FLAGS_NETSERV) +#define IsXtraOp(x) ((x)->modes & FLAGS_XTRAOP) +#define IsServerNotice(x) ((x)->modes & FLAGS_SERVERNOTICE) +#define IsHiddenOper(x) ((x)->modes & FLAGS_HIDDENOPER) +#define IsSeeNoIdle(x) ((x)->modes & FLAGS_SEENOIDLE) +#define IsFakeHost(x) ((x)->fakehost[0] != '\0') +#define IsFakeIdent(x) ((x)->fakeident[0] != '\0') #define IsLocal(x) ((x)->uplink == self) +#define NOFLOODLEN 15 #define NICKLEN 30 #define USERLEN 10 #define HOSTLEN 63 #define REALLEN 50 -#define TOPICLEN 250 +#define TOPICLEN 500 #define CHANNELLEN 200 +#define MAXOPLEVEL 999 -#define MAXMODEPARAMS 6 -#define MAXBANS 45 +#define MAXMODEPARAMS 6 +#define MAXBANS 999 /* IDLEN is 6 because it takes 5.33 Base64 digits to store 32 bytes. */ #define IDLEN 6 @@ -101,16 +127,19 @@ struct userNode { char ident[USERLEN + 1]; /* Per-host identification for user */ char info[REALLEN + 1]; /* Free form additional client information */ char hostname[HOSTLEN + 1]; /* DNS name or IP address */ + char fakehost[HOSTLEN + 1]; /* Assigned fake host */ + char fakeident[USERLEN + 1]; /* Assigned fake ident */ #ifdef WITH_PROTOCOL_P10 char numeric[COMBO_NUMERIC_LEN+1]; unsigned int num_local : 18; #endif unsigned int dead : 1; /* Is user waiting to be recycled? */ - struct in_addr ip; /* User's IP address */ + irc_in_addr_t ip; /* User's IP address */ long modes; /* user flags +isw etc... */ - time_t timestamp; /* Time of last nick change */ - struct server *uplink; /* Server that user is connected to */ + unsigned long timestamp; /* Time of last nick change */ + unsigned long idle_since; /* Last time user did something on or to a channel */ + struct server *uplink; /* Server that user is connected to */ struct modeList channels; /* Vector of channels user is in */ /* from nickserv */ @@ -121,17 +150,24 @@ struct userNode { struct chanNode { chan_mode_t modes; - unsigned int limit, locks; + unsigned int limit; + unsigned int access; + unsigned int locks; char key[KEYLEN + 1]; - time_t timestamp; /* creation time */ - + char altchan[CHANNELLEN + 1]; + char noflood[NOFLOODLEN + 1]; + char upass[KEYLEN + 1]; + char apass[KEYLEN + 1]; + unsigned long timestamp; /* creation time */ + char topic[TOPICLEN + 1]; char topic_nick[NICKLEN + 1]; - time_t topic_time; + unsigned long topic_time; struct modeList members; struct banList banlist; struct policer join_policer; + struct userList invited; unsigned int join_flooded : 1; unsigned int bad_channel : 1; @@ -143,14 +179,15 @@ struct chanNode { struct banNode { char ban[NICKLEN + USERLEN + HOSTLEN + 3]; /* 1 for '\0', 1 for ! and 1 for @ = 3 */ char who[NICKLEN + 1]; /* who set ban */ - time_t set; /* time ban was set */ + unsigned long set; /* time ban was set */ }; struct modeNode { struct chanNode *channel; struct userNode *user; - long modes; - time_t idle_since; + unsigned short modes; + short oplevel; + unsigned long idle_since; }; #define SERVERNAMEMAX 64 @@ -158,8 +195,8 @@ struct modeNode { struct server { char name[SERVERNAMEMAX+1]; - time_t boot; - time_t link; + unsigned long boot; + unsigned long link_time; char description[SERVERDESCRIPTMAX+1]; #ifdef WITH_PROTOCOL_P10 char numeric[COMBO_NUMERIC_LEN+1]; @@ -181,7 +218,7 @@ extern dict_t channels; extern dict_t clients; extern dict_t servers; extern unsigned int max_clients, invis_clients; -extern time_t max_clients_time; +extern unsigned long max_clients_time; extern struct userList curr_opers, curr_helpers; struct server* GetServerH(const char *name); /* using full name */ @@ -189,10 +226,12 @@ struct userNode* GetUserH(const char *nick); /* using nick */ struct chanNode* GetChannel(const char *name); struct modeNode* GetUserMode(struct chanNode* channel, struct userNode* user); +int userList_contains(struct userList *list, struct userNode *user); + typedef void (*server_link_func_t) (struct server *server); void reg_server_link_func(server_link_func_t handler); -typedef int (*new_user_func_t) (struct userNode *user); +typedef void (*new_user_func_t) (struct userNode *user); void reg_new_user_func(new_user_func_t handler); typedef void (*del_user_func_t) (struct userNode *user, struct userNode *killer, const char *why); void reg_del_user_func(del_user_func_t handler); @@ -202,10 +241,11 @@ typedef void (*nick_change_func_t)(struct userNode *user, const char *old_nick); void reg_nick_change_func(nick_change_func_t handler); void NickChange(struct userNode* user, const char *new_nick, int no_announce); -typedef void (*account_func_t) (struct userNode *user, const char *stamp); +typedef void (*account_func_t) (struct userNode *user, const char *stamp, unsigned long timestamp, unsigned long serial); void reg_account_func(account_func_t handler); -void call_account_func(struct userNode *user, const char *stamp); -void StampUser(struct userNode *user, const char *stamp); +void call_account_func(struct userNode *user, const char *stamp, unsigned long timestamp, unsigned long serial); +void StampUser(struct userNode *user, const char *stamp, unsigned long timestamp, unsigned long serial); +void assign_fakehost(struct userNode *user, const char *host, const char *ident, int force, int announce); typedef void (*new_channel_func_t) (struct chanNode *chan); void reg_new_channel_func(new_channel_func_t handler); @@ -214,12 +254,13 @@ void reg_join_func(join_func_t handler); typedef void (*del_channel_func_t) (struct chanNode *chan); void reg_del_channel_func(del_channel_func_t handler); -struct chanNode* AddChannel(const char *name, time_t time_, const char *modes, char *banlist); +struct chanNode* AddChannel(const char *name, unsigned long time_, const char *modes, char *banlist); void LockChannel(struct chanNode *channel); void UnlockChannel(struct chanNode *channel); struct modeNode* AddChannelUser(struct userNode* user, struct chanNode* channel); +int modeNode_sort(const void *pa, const void *pb); 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);