Merge

[irc/rqf/shadowircd.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index aad68a6d0ce38e10e874b697acc0c408a32a4915..178a9a37a960cc5755a01c23c86dac93140d8502 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -40,6 +40,7 @@
 #include "snomask.h"
 #include "match.h"
 #include "ircd.h"
+#include "privilege.h"
 
 /* other structs */
 struct Blacklist;
@@ -168,8 +169,14 @@ struct Client
         */
        rb_dlink_list on_allow_list;
 
+       time_t first_received_message_time;
+       int received_number_of_privmsgs;
+       int flood_noticed;
+
        local_user_t *localClient;
        pre_client_t *preClient;
+
+       time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
 };
 
 struct LocalUser
@@ -189,9 +196,6 @@ struct LocalUser
        int oper_warn_count_down;       /* warn opers of this possible 
                                           spambot every time this gets to 0 */
        time_t last_caller_id_time;
-       time_t first_received_message_time;
-       int received_number_of_privmsgs;
-       int flood_noticed;
 
        time_t lasttime;        /* last time we parsed something */
        time_t firsttime;       /* time client was created */
@@ -276,10 +280,13 @@ struct LocalUser
                              applicable to this client */
 
        struct _ssl_ctl *ssl_ctl;               /* which ssl daemon we're associate with */
-       rb_uint32_t localflags;
+       struct _ssl_ctl *z_ctl;                 /* second ctl for ssl+zlib */
+       uint32_t localflags;
        struct ZipStats *zipstats;              /* zipstats */
-       rb_uint16_t cork_count;                 /* used for corking/uncorking connections */
+       uint16_t cork_count;                    /* used for corking/uncorking connections */
        struct ev_entry *event;                 /* used for associated events */
+
+       struct PrivilegeSet *privset;           /* privset... */
 };
 
 struct PreClient
@@ -294,6 +301,8 @@ struct PreClient
 
        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
@@ -306,12 +315,6 @@ struct ListClient
         */
 };
 
-struct exit_client_hook
-{
-       struct Client *client_p;
-       char exit_message[TOPICLEN];
-};
-
 /*
  * status macros.
  */
@@ -399,16 +402,14 @@ struct exit_client_hook
 #define FLAGS_FLOODDONE    0x0100      /* flood grace period over / reported */
 #define FLAGS_NORMALEX     0x0400      /* Client exited normally */
 #define FLAGS_SENDQEX      0x0800      /* Sendq exceeded */
-#define FLAGS_SERVLINK     0x10000     /* servlink has servlink process */
-#define FLAGS_MARK        0x20000      /* marked client */
-#define FLAGS_HIDDEN       0x40000     /* hidden server */
-#define FLAGS_EOB          0x80000     /* EOB */
-#define FLAGS_MYCONNECT           0x100000     /* MyConnect */
-#define FLAGS_IOERROR      0x200000    /* IO error */
-#define FLAGS_SERVICE     0x400000     /* network service */
-#define FLAGS_TGCHANGE     0x800000    /* we're allowed to clear something */
-#define FLAGS_DYNSPOOF     0x1000000   /* dynamic spoof, only opers see ip */
-#define FLAGS_EXUNKNOWN           0x2000000    /* too many unknowns exit.. */
+#define FLAGS_MARK        0x10000      /* marked client */
+#define FLAGS_HIDDEN       0x20000     /* hidden server */
+#define FLAGS_EOB          0x40000     /* EOB */
+#define FLAGS_MYCONNECT           0x80000      /* MyConnect */
+#define FLAGS_IOERROR      0x100000    /* IO error */
+#define FLAGS_SERVICE     0x200000     /* network service */
+#define FLAGS_TGCHANGE     0x400000    /* we're allowed to clear something */
+#define FLAGS_DYNSPOOF     0x800000    /* dynamic spoof, only opers see ip */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL             0x00000001
@@ -483,8 +484,6 @@ struct exit_client_hook
 #define IsDynSpoof(x)          ((x)->flags & FLAGS_DYNSPOOF)
 #define SetDynSpoof(x)         ((x)->flags |= FLAGS_DYNSPOOF)
 #define ClearDynSpoof(x)       ((x)->flags &= ~FLAGS_DYNSPOOF)
-#define IsExUnknown(x)         ((x)->flags & FLAGS_EXUNKNOWN)
-#define SetExUnknown(x)                ((x)->flags |= FLAGS_EXUNKNOWN)
 
 /* local flags */
 
@@ -569,7 +568,6 @@ extern void check_dlines(void);
 extern void check_xlines(void);
 
 extern const char *get_client_name(struct Client *client, int show_ip);
-extern const char *get_server_name(struct Client *client, int show_ip);
 extern const char *log_client_name(struct Client *, int);
 extern int is_remote_connect(struct Client *);
 extern void init_client(void);