hunt_server: Disallow wildcarded nicknames.

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

diff --git a/include/s_serv.h b/include/s_serv.h
index 804569ef9c3a54e3883169da9bddeeea445b8467..f35feba842b093b35cfc49bde1a5047b12bb7d52 100644 (file)
--- a/include/s_serv.h
+++ b/include/s_serv.h
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.h 1863 2006-08-27 13:40:37Z jilles $
  */
 
 #ifndef INCLUDED_serv_h
@@ -35,9 +34,6 @@
  */
 #define TRY_CONNECTIONS_TIME   60
 
-/* collect ziplinks compression ratios/etc every minute */
-#define ZIPSTATS_TIME           60
-
 /*
  * number of seconds to wait after server starts up, before
  * starting try_connections()
@@ -54,6 +50,7 @@ struct Capability
 {
        const char *name;       /* name of capability */
        unsigned int cap;       /* mask value */
+       unsigned int required;  /* 1 if required, 0 if not */
 };
 
 #define CAP_CAP         0x00001        /* received a CAP to begin with */
@@ -62,7 +59,6 @@ struct Capability
 #define CAP_CHW         0x00008        /* Can do channel wall @# */
 #define CAP_IE          0x00010        /* Can do invite exceptions */
 #define CAP_KLN                0x00040 /* Can do KLINE message */
-#define CAP_GLN                0x00080 /* Can do GLINE message */
 #define CAP_ZIP         0x00100        /* Can do ZIPlinks */
 #define CAP_KNOCK      0x00400 /* supports KNOCK */
 #define CAP_TB         0x00800 /* supports TBURST */
@@ -74,12 +70,16 @@ struct Capability
 #define CAP_RSFNC      0x20000 /* rserv FNC */
 #define CAP_SAVE       0x40000 /* supports SAVE (nick collision FNC) */
 #define CAP_EUID       0x80000 /* supports EUID (ext UID + nonencap CHGHOST) */
+#define CAP_EOPMOD     0x100000 /* supports EOPMOD (ext +z + ext topic) */
+#define CAP_BAN                0x200000 /* supports propagated bans */
+#define CAP_MLOCK      0x400000 /* supports MLOCK messages */
 
 #define CAP_MASK        (CAP_QS  | CAP_EX   | CAP_CHW  | \
                          CAP_IE  | CAP_KLN  | CAP_SERVICE |\
-                         CAP_GLN | CAP_CLUSTER | CAP_ENCAP | \
+                         CAP_CLUSTER | CAP_ENCAP | \
                          CAP_ZIP  | CAP_KNOCK  | CAP_UNKLN | \
-                        CAP_RSFNC | CAP_SAVE | CAP_EUID)
+                        CAP_RSFNC | CAP_SAVE | CAP_EUID | CAP_EOPMOD | \
+                        CAP_BAN | CAP_MLOCK)
 
 #ifdef HAVE_LIBZ
 #define CAP_ZIP_SUPPORTED       CAP_ZIP
@@ -94,35 +94,6 @@ struct Capability
 #define NotCapable(x, cap)     (((x)->localClient->caps & (cap)) == 0)
 #define ClearCap(x, cap)        ((x)->localClient->caps &= ~(cap))
 
-#define SLINKCMD_SET_ZIP_OUT_LEVEL           1 /* data */
-#define SLINKCMD_START_ZIP_OUT               2
-#define SLINKCMD_START_ZIP_IN                3
-#define SLINKCMD_INJECT_RECVQ                4 /* data */
-#define SLINKCMD_INJECT_SENDQ                5 /* data */
-#define SLINKCMD_INIT                        6
-#define SLINKCMD_ZIPSTATS                    7
-
-#ifndef HAVE_SOCKETPAIR
-#define LAST_SLINK_FD   7
-#else
-#define LAST_SLINK_FD   5
-#endif
-
-#define SLINKRPL_FLAG_DATA      0x0001 /* reply has data following */
-#define SLINKRPL_ERROR          1
-#define SLINKRPL_ZIPSTATS       2
-
-#define MAX_SLINKRPL            2
-
-typedef void SlinkRplHnd(unsigned int replyid, unsigned int datalen,
-                        unsigned char *data, struct Client *client_p);
-struct SlinkRplDef
-{
-       unsigned int replyid;
-       SlinkRplHnd *handler;
-       unsigned int flags;
-};
-
 /*
  * Globals
  *