ssl sync with http://hg.angelforce.ru/charybdis-old

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

diff --git a/include/client.h b/include/client.h
index 11b71f465c6fd9f3d45a8f2d96c48894c2647aa6..edf585f5a4f78f4f537f25ec3bf6d95fe10b1cd2 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -254,16 +254,7 @@ struct LocalUser
        /* time challenge response is valid for */
        time_t chal_time;
 
-       int ctrlfd;             /* For servers:
-                                  control fd used for sending commands
-                                  to servlink */
-
-       struct SlinkRpl slinkrpl;       /* slink reply being parsed */
-       unsigned char *slinkq;  /* sendq for control data */
-       int slinkq_ofs;         /* ofset into slinkq */
-       int slinkq_len;         /* length remaining after slinkq_ofs */
-
-       struct ZipStats zipstats;
+       struct DNSQuery *dnsquery; /* for outgoing server's name lookup */
 
        time_t last_away;       /* Away since... */
        time_t last;
@@ -297,9 +288,11 @@ struct LocalUser
        char *mangledhost; /* non-NULL if host mangling module loaded and
                              applicable to this client */
 
-       struct rb_sockaddr_storage *lip;        /* alloc before auth/freed after auth */\r
-       struct _ssl_ctl *ssl_ctl;               /* which ssl daemon we're associate with */
-       rb_uint32_t localflags;
+       struct _ssl_ctl *ssl_ctl;               /* which ssl daemon we're associate with */\r
+       rb_uint32_t localflags;\r
+       struct ZipStats *zipstats;              /* zipstats */
+       rb_uint16_t cork_count;                 /* used for corking/uncorking connections */
+       struct ev_entry *event;                 /* used for associated events */
 };
 
 struct PreClient
@@ -435,6 +428,11 @@ struct exit_client_hook
 #define FLAGS_DYNSPOOF     0x1000000   /* dynamic spoof, only opers see ip */
 #define FLAGS_EXUNKNOWN           0x2000000    /* too many unknowns exit.. */
 
+/* flags for local clients, this needs stuff moved from above to here at some point */\r
+#define LFLAGS_SSL             0x00000001\r
+#define LFLAGS_FLUSH           0x00000002\r
+#define LFLAGS_CORK            0x00000004
+
 /* umodes, settable flags */
 /* lots of this moved to snomask -- jilles */
 #define UMODE_SERVNOTICE   0x0001      /* server notices */
@@ -465,10 +463,6 @@ struct exit_client_hook
 #define FLAGS2_EXEMPTSHIDE     0x40000000
 #define FLAGS2_EXEMPTJUPE      0x80000000
 
-/* flags for local clients, this needs stuff moved from above to here at some point */\r
-#define LFLAGS_SSL             0x00000001\r
-#define LFLAGS_FLUSH           0x00000002
-
 #define DEFAULT_OPER_UMODES (UMODE_SERVNOTICE | UMODE_OPERWALL | \
                              UMODE_WALLOP | UMODE_LOCOPS)
 #define DEFAULT_OPER_SNOMASK SNO_GENERAL
@@ -511,7 +505,7 @@ struct exit_client_hook
 #define ClearDynSpoof(x)       ((x)->flags &= ~FLAGS_DYNSPOOF)
 #define IsExUnknown(x)         ((x)->flags & FLAGS_EXUNKNOWN)
 #define SetExUnknown(x)                ((x)->flags |= FLAGS_EXUNKNOWN)
-\r
+
 /* local flags */\r
 \r
 #define IsSSL(x)               ((x)->localClient->localflags & LFLAGS_SSL)\r
@@ -575,6 +569,11 @@ struct exit_client_hook
 #define IsFloodDone(x)          ((x)->flags & FLAGS_FLOODDONE)
 #define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
 
+/* These also operate on the uplink from which it came */\r
+#define IsCork(x)              (MyConnect(x) ? (x)->localClient->cork_count : (x)->from->localClient->cork_count)\r
+#define SetCork(x)             (MyConnect(x) ? (x)->localClient->cork_count++ : (x)->from->localClient->cork_count++ )\r
+#define ClearCork(x)           (MyConnect(x) ? (x)->localClient->cork_count-- : (x)->from->localClient->cork_count--)
+
 /*
  * definitions for get_client_name
  */
@@ -627,7 +626,6 @@ extern void close_connection(struct Client *);
 extern void init_uid(void);
 extern char *generate_uid(void);
 
-void flood_endgrace(struct Client *);
 void allocate_away(struct Client *);\r
 void free_away(struct Client *);