ircd: implement EXTENDCHANS, based on ircd-seven (with some improvements from chatircd)

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index c54ea2b98ef50f977494ff533ed31b54ab5df321..0ecebc19c4f65fe1a24b8cc670783b4a548d172d 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"
@@ -71,7 +71,6 @@ struct Server;
 struct LocalUser;
 struct AuthRequest;
 struct PreClient;
-struct ListClient;
 struct scache_entry;
 
 /*
@@ -228,6 +227,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 +235,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;
@@ -270,19 +269,22 @@ struct LocalUser
        time_t ratelimit;
        unsigned int join_who_credits;
 
-       struct ListClient *safelist_data;
-
        char *mangledhost; /* non-NULL if host mangling module loaded and
                              applicable to this client */
 
        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,24 +293,12 @@ 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 */
 
        struct rb_sockaddr_storage lip; /* address of our side of the connection */
 };
 
-struct ListClient
-{
-       unsigned int hash_indice;
-       unsigned int users_min, users_max;
-       time_t created_min, created_max, topic_min, topic_max;
-       int operspy;
-};
-
 /*
  * status macros.
  */
@@ -430,6 +420,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,12 +433,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_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.
@@ -543,6 +537,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
@@ -586,6 +582,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 *);