ircd: import modified version of ratbox 3.1 whowas code

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 171ddd4757e6c68a1babaf69fc997e4f0113047e..0261c7753af859d6f82b534998a1c121fca1c552 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -36,7 +36,7 @@
 
 #include "ircd_defs.h"
 #include "channel.h"
-#include "res.h"
+#include "dns.h"
 #include "snomask.h"
 #include "match.h"
 #include "ircd.h"
@@ -117,7 +117,8 @@ struct Client
        struct Client *servptr; /* Points to server this Client is on */
        struct Client *from;    /* == self, if Local Client, *NEVER* NULL! */
 
-       struct Whowas *whowas;  /* Pointers to whowas structs */
+       rb_dlink_list whowas_clist;
+
        time_t tsinfo;          /* TS on the nick, SVINFO on server */
        unsigned int umodes;    /* opers, normal users subset */
        unsigned int flags;     /* client flags */
@@ -228,6 +229,7 @@ struct LocalUser
        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 */
@@ -235,10 +237,9 @@ struct LocalUser
        /* time challenge response is valid for */
        time_t chal_time;
 
-       struct DNSQuery *dnsquery; /* for outgoing server's name lookup */
-
        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;
@@ -277,12 +278,17 @@ struct LocalUser
 
        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
@@ -291,10 +297,6 @@ 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 */
 
@@ -303,7 +305,7 @@ struct PreClient
 
 struct ListClient
 {
-       unsigned int hash_indice;
+       char *chname;
        unsigned int users_min, users_max;
        time_t created_min, created_max, topic_min, topic_max;
        int operspy;
@@ -430,6 +432,7 @@ struct ListClient
 
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
+#define FLAGS2_EXTENDCHANS     0x00200000
 #define FLAGS2_EXEMPTRESV      0x00400000
 #define FLAGS2_EXEMPTKLINE      0x00800000
 #define FLAGS2_EXEMPTFLOOD      0x01000000
@@ -442,13 +445,15 @@ struct ListClient
                              UMODE_WALLOP | UMODE_LOCOPS)
 #define DEFAULT_OPER_SNOMASK SNO_GENERAL
 
-#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_SASL_REAUTH     0x0040
+#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.
@@ -544,6 +549,8 @@ struct ListClient
 #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
@@ -587,6 +594,8 @@ 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 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 *);