Merge

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

diff --git a/include/client.h b/include/client.h
index 6c856492841c380fb0a5359d3590b54f3ae424ba..178a9a37a960cc5755a01c23c86dac93140d8502 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -175,6 +175,8 @@ struct Client
 
        local_user_t *localClient;
        pre_client_t *preClient;
+
+       time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
 };
 
 struct LocalUser
@@ -278,6 +280,7 @@ struct LocalUser
                              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 localflags;
        struct ZipStats *zipstats;              /* zipstats */
        uint16_t cork_count;                    /* used for corking/uncorking connections */
@@ -298,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
@@ -310,12 +315,6 @@ struct ListClient
         */
 };
 
-struct exit_client_hook
-{
-       struct Client *client_p;
-       char exit_message[TOPICLEN];
-};
-
 /*
  * status macros.
  */
@@ -411,7 +410,6 @@ struct exit_client_hook
 #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 */
-#define FLAGS_EXUNKNOWN           0x1000000    /* too many unknowns exit.. */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL             0x00000001
@@ -486,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 */