Show reason for failed outgoing SSL handshakes to opers.

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

diff --git a/include/client.h b/include/client.h
index d5d15f50e46b8e77806b4cb631e18f77a55d2868..9c6203000546a10aca48dfc964656cfbc52c8a1d 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -38,8 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */
@@ -109,25 +108,12 @@ struct Server
        struct scache_entry *nameinfo;
 };
 
-struct SlinkRpl
-{
-       int command;
-       int datalen;
-       int gotdatalen;
-       int readdata;
-       unsigned char *data;
-};
-
 struct ZipStats
 {
-       unsigned long in;
-       unsigned long in_wire;
-       unsigned long out;
-       unsigned long out_wire;
-       unsigned long inK;
-       unsigned long inK_wire;
-       unsigned long outK;
-       unsigned long outK_wire;
+       unsigned long long in;
+       unsigned long long in_wire;
+       unsigned long long out;
+       unsigned long long out_wire;
        double in_ratio;
        double out_ratio;
 };
@@ -244,6 +230,7 @@ struct LocalUser
         * agreed. lets get rid of it someday! --nenolod
         */
        char *passwd;
+       char *auth_user;
        char *opername; /* name of operator{} block being used or tried (challenge) */
        char *challenge;
        char *fullcaps;
@@ -387,12 +374,7 @@ struct exit_client_hook
  * ts stuff
  */
 #define TS_CURRENT     6
-
-#ifdef TS6_ONLY
 #define TS_MIN          6
-#else
-#define TS_MIN          3
-#endif
 
 #define TS_DOESTS       0x10000000
 #define DoesTS(x)       ((x)->tsinfo & TS_DOESTS)
@@ -436,29 +418,26 @@ struct exit_client_hook
 /* umodes, settable flags */
 /* lots of this moved to snomask -- jilles */
 #define UMODE_SERVNOTICE   0x0001      /* server notices */
-#define UMODE_WALLOP       0x0100      /* send wallops to them */
-#define UMODE_OPERWALL     0x0200      /* Operwalls */
-#define UMODE_INVISIBLE    0x0400      /* makes user invisible */
-#define UMODE_CALLERID     0x2000      /* block unless caller id's */
-#define UMODE_LOCOPS       0x8000      /* show locops */
-#define UMODE_SERVICE      0x40000
-#define UMODE_DEAF        0x80000
-#define UMODE_NOFORWARD    0x400000    /* don't forward */
-#define UMODE_REGONLYMSG   0x800000    /* only allow logged in users to msg */
+#define UMODE_WALLOP       0x0002      /* send wallops to them */
+#define UMODE_OPERWALL     0x0004      /* Operwalls */
+#define UMODE_INVISIBLE    0x0008      /* makes user invisible */
+#define UMODE_CALLERID     0x0010      /* block unless caller id's */
+#define UMODE_LOCOPS       0x0020      /* show locops */
+#define UMODE_SERVICE      0x0040
+#define UMODE_DEAF        0x0080
+#define UMODE_NOFORWARD    0x0100      /* don't forward */
+#define UMODE_REGONLYMSG   0x0200      /* only allow logged in users to msg */
 
 /* user information flags, only settable by remote mode or local oper */
-#define UMODE_OPER         0x100000    /* Operator */
-#define UMODE_ADMIN        0x200000    /* Admin on server */
-#define UMODE_SSLCLIENT    0x1000000   /* using SSL */
-
-#define UMODE_ALL         UMODE_SERVNOTICE
+#define UMODE_OPER         0x1000      /* Operator */
+#define UMODE_ADMIN        0x2000      /* Admin on server */
+#define UMODE_SSLCLIENT    0x4000      /* using SSL */
 
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
 #define FLAGS2_EXEMPTRESV      0x00400000
-#define FLAGS2_EXEMPTGLINE      0x00800000
-#define FLAGS2_EXEMPTKLINE      0x01000000
-#define FLAGS2_EXEMPTFLOOD      0x02000000
+#define FLAGS2_EXEMPTKLINE      0x00800000
+#define FLAGS2_EXEMPTFLOOD      0x01000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT   0x20000000
 #define FLAGS2_EXEMPTSHIDE     0x40000000
@@ -552,8 +531,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
 #define SetExemptFlood(x)       ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
 #define IsExemptSpambot(x)     ((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
@@ -588,12 +565,10 @@ struct exit_client_hook
 extern void check_banned_lines(void);
 extern void check_klines_event(void *unused);
 extern void check_klines(void);
-extern void check_glines(void);
 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);