X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c6240d79407736a0c1e47052d780ce901e81b9a2..52fae04da0a3934413654040f5e5e60b38b3f676:/include/s_serv.h diff --git a/include/s_serv.h b/include/s_serv.h index c52c78de..6808c37e 100644 --- a/include/s_serv.h +++ b/include/s_serv.h @@ -20,14 +20,13 @@ * along with this program; if not, write to the Free Software * 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 #define INCLUDED_serv_h -#include "config.h" +#include "defaults.h" +#include "capability.h" /* * The number of seconds between calls to try_connections(). Fiddle with @@ -38,7 +37,7 @@ /* * number of seconds to wait after server starts up, before * starting try_connections() - * TOO SOON and you can nick collide like crazy. + * TOO SOON and you can nick collide like crazy. */ #define STARTUP_CONNECTIONS_TIME 60 @@ -47,37 +46,56 @@ struct server_conf; struct Channel; /* Capabilities */ -struct Capability -{ - const char *name; /* name of capability */ - unsigned int cap; /* mask value */ - unsigned int required; /* 1 if required, 0 if not */ +extern struct CapabilityIndex *serv_capindex; +extern struct CapabilityIndex *cli_capindex; + +/* register client capabilities with this structure for 3.2 enhanced capability negotiation */ +#define CLICAP_FLAGS_STICKY 0x001 +#define CLICAP_FLAGS_REQACK 0x002 + +struct ClientCapability { + bool (*visible)(struct Client *); /* whether or not to display the capability. set to NULL or true return value = displayed */ + const char *(*data)(struct Client *); /* any custom data for the capability. set to NULL or return NULL = no data */ + unsigned int flags; }; -#define CAP_CAP 0x00001 /* received a CAP to begin with */ -#define CAP_QS 0x00002 /* Can handle quit storm removal */ -#define CAP_EX 0x00004 /* Can do channel +e exemptions */ -#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_ZIP 0x00100 /* Can do ZIPlinks */ -#define CAP_KNOCK 0x00400 /* supports KNOCK */ -#define CAP_TB 0x00800 /* supports TBURST */ -#define CAP_UNKLN 0x01000 /* supports remote unkline */ -#define CAP_CLUSTER 0x02000 /* supports cluster stuff */ -#define CAP_ENCAP 0x04000 /* supports ENCAP */ -#define CAP_TS6 0x08000 /* supports TS6 or above */ -#define CAP_SERVICE 0x10000 -#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_MASK (CAP_QS | CAP_EX | CAP_CHW | \ - CAP_IE | CAP_KLN | CAP_SERVICE |\ - CAP_CLUSTER | CAP_ENCAP | \ - CAP_ZIP | CAP_KNOCK | CAP_UNKLN | \ - CAP_RSFNC | CAP_SAVE | CAP_EUID | CAP_EOPMOD) +/* builtin client capabilities */ +extern unsigned int CLICAP_MULTI_PREFIX; +extern unsigned int CLICAP_ACCOUNT_NOTIFY; +extern unsigned int CLICAP_EXTENDED_JOIN; +extern unsigned int CLICAP_AWAY_NOTIFY; +extern unsigned int CLICAP_USERHOST_IN_NAMES; +extern unsigned int CLICAP_CAP_NOTIFY; +extern unsigned int CLICAP_CHGHOST; +extern unsigned int CLICAP_ECHO_MESSAGE; + +/* + * XXX: this is kind of ugly, but this allows us to have backwards + * API-compatibility. + */ +extern unsigned int CAP_CAP; /* received a CAP to begin with */ +extern unsigned int CAP_QS; /* Can handle quit storm removal */ +extern unsigned int CAP_EX; /* Can do channel +e exemptions */ +extern unsigned int CAP_CHW; /* Can do channel wall @# */ +extern unsigned int CAP_IE; /* Can do invite exceptions */ +extern unsigned int CAP_KLN; /* Can do KLINE message */ +extern unsigned int CAP_ZIP; /* Can do ZIPlinks */ +extern unsigned int CAP_KNOCK; /* supports KNOCK */ +extern unsigned int CAP_TB; /* supports TBURST */ +extern unsigned int CAP_UNKLN; /* supports remote unkline */ +extern unsigned int CAP_CLUSTER; /* supports cluster stuff */ +extern unsigned int CAP_ENCAP; /* supports ENCAP */ +extern unsigned int CAP_TS6; /* supports TS6 or above */ +extern unsigned int CAP_SERVICE; /* supports services */ +extern unsigned int CAP_RSFNC; /* rserv FNC */ +extern unsigned int CAP_SAVE; /* supports SAVE (nick collision FNC) */ +extern unsigned int CAP_EUID; /* supports EUID (ext UID + nonencap CHGHOST) */ +extern unsigned int CAP_EOPMOD; /* supports EOPMOD (ext +z + ext topic) */ +extern unsigned int CAP_BAN; /* supports propagated bans */ +extern unsigned int CAP_MLOCK; /* supports MLOCK messages */ + +/* XXX: added for backwards compatibility. --nenolod */ +#define CAP_MASK (capability_index_mask(serv_capindex) & ~(CAP_TS6 | CAP_CAP)) #ifdef HAVE_LIBZ #define CAP_ZIP_SUPPORTED CAP_ZIP @@ -100,25 +118,24 @@ struct Capability * because all servers that we talk to already do TS, and the kludged * extra argument to "PASS" takes care of checking that. -orabidoo */ -extern struct Capability captab[]; - extern int MaxClientCount; /* GLOBAL - highest number of clients */ extern int MaxConnectionCount; /* GLOBAL - highest number of connections */ extern int refresh_user_links; /* - * return values for hunt_server() + * return values for hunt_server() */ #define HUNTED_NOSUCH (-1) /* if the hunted server is not found */ #define HUNTED_ISME 0 /* if this server should execute the command */ #define HUNTED_PASS 1 /* if message passed onwards successfully */ +extern void init_builtin_capabs(void); extern int hunt_server(struct Client *client_pt, struct Client *source_pt, const char *command, int server, int parc, const char **parv); -extern void send_capabilities(struct Client *, int); +extern void send_capabilities(struct Client *, unsigned int); extern const char *show_capabilities(struct Client *client); extern void try_connections(void *unused);