ircd: rewrite SOCKET_ERROR as I_SOCKET_ERROR

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 09bc400451cb84a1dd36cb22966c15454e09a775..f844aac7925e761851b6cbd4c88d450d3f048e09 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -21,18 +21,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: client.h 3446 2007-05-14 22:21:16Z jilles $
  */
 
 #ifndef INCLUDED_client_h
 #define INCLUDED_client_h
 
-#include "config.h"
-
-#if !defined(CONFIG_RATBOX_LEVEL_1)
-#error Incorrect config.h for this revision of ircd.
-#endif
+#include "defaults.h"
 
 #include "ircd_defs.h"
 #include "channel.h"
@@ -71,6 +65,7 @@ struct Server;
 struct LocalUser;
 struct AuthRequest;
 struct PreClient;
+struct ListClient;
 struct scache_entry;
 
 /*
@@ -116,7 +111,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 */
@@ -269,6 +265,8 @@ 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 */
 
@@ -299,6 +297,14 @@ struct PreClient
        struct rb_sockaddr_storage lip; /* address of our side of the connection */
 };
 
+struct ListClient
+{
+       char *chname;
+       unsigned int users_min, users_max;
+       time_t created_min, created_max, topic_min, topic_max;
+       int operspy;
+};
+
 /*
  * status macros.
  */
@@ -394,6 +400,7 @@ struct PreClient
 #define FLAGS_TGCHANGE     0x400000    /* we're allowed to clear something */
 #define FLAGS_DYNSPOOF     0x800000    /* dynamic spoof, only opers see ip */
 #define FLAGS_TGEXCESSIVE  0x1000000   /* whether the client has attemped to change targets excessively fast */
+#define FLAGS_CLICAP_DATA  0x2000000   /* requested CAP LS 302 */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL             0x00000001
@@ -420,6 +427,7 @@ struct PreClient
 
 /* 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
@@ -432,16 +440,6 @@ struct PreClient
                              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_USERHOST_IN_NAMES       0x0040
-#define CLICAP_CAP_NOTIFY              0x0080
-#define CLICAP_CHGHOST                 0x0100
-
 /*
  * flags macros.
  */
@@ -536,6 +534,8 @@ struct PreClient
 #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