X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fhash.h;h=da4b40f53b2a9628e88189078ef481a360b7354f;hb=a3c5403a1dda051a7fae6b604af976b7224182b9;hp=0611f841ee79637b3153275c7116ae18f9ec5cd0;hpb=51d185d9c8adfa87cbc5376beebb6c467a6a1bd2;p=srvx.git diff --git a/src/hash.h b/src/hash.h index 0611f84..da4b40f 100644 --- a/src/hash.h +++ b/src/hash.h @@ -43,24 +43,37 @@ #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 /* global operator +o */ -#define FLAGS_INVISIBLE 0x0004 /* invisible +i */ -#define FLAGS_WALLOP 0x0008 /* receives wallops +w */ -#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_NOCHAN 0x0100 /* hide channels in whois +n */ +#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 /* user's host is masked by their account */ -#define FLAGS_REGNICK 0x4000 /* user owns their current nick */ +#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 /* hide idle time in whois +I */ +#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) @@ -78,19 +91,27 @@ #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 MAXBANS 999 /* IDLEN is 6 because it takes 5.33 Base64 digits to store 32 bytes. */ #define IDLEN 6 @@ -107,6 +128,7 @@ struct userNode { 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; @@ -129,8 +151,11 @@ struct userNode { struct chanNode { chan_mode_t modes; unsigned int limit; + unsigned int access; unsigned int locks; char key[KEYLEN + 1]; + char altchan[CHANNELLEN + 1]; + char noflood[NOFLOODLEN + 1]; char upass[KEYLEN + 1]; char apass[KEYLEN + 1]; unsigned long timestamp; /* creation time */ @@ -142,6 +167,7 @@ struct chanNode { struct modeList members; struct banList banlist; struct policer join_policer; + struct userList invited; unsigned int join_flooded : 1; unsigned int bad_channel : 1; @@ -170,7 +196,7 @@ struct modeNode { struct server { char name[SERVERNAMEMAX+1]; unsigned long boot; - unsigned long link; + unsigned long link_time; char description[SERVERDESCRIPTMAX+1]; #ifdef WITH_PROTOCOL_P10 char numeric[COMBO_NUMERIC_LEN+1]; @@ -219,7 +245,7 @@ typedef void (*account_func_t) (struct userNode *user, const char *stamp, unsign void reg_account_func(account_func_t handler); 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, int announce); +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); @@ -234,6 +260,7 @@ 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);