9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ircd: chase capability API changes

Browse source
This commit is contained in:
William Pitcock 2016-02-27 00:01:54 -06:00
parent 63b9db9675
commit 486cd34415
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/s_serv.h
View file

@ -49,6 +49,7 @@ struct Channel;
/* Capabilities */ /* Capabilities */
extern struct CapabilityIndex *serv_capindex; extern struct CapabilityIndex *serv_capindex;
extern struct CapabilityIndex *cli_capindex;
/* /*
* XXX: this is kind of ugly, but this allows us to have backwards * XXX: this is kind of ugly, but this allows us to have backwards

39
ircd/s_serv.c
View file

@ -72,6 +72,7 @@ static char buf[BUFSIZE];
* extra argument to "PASS" takes care of checking that. -orabidoo * extra argument to "PASS" takes care of checking that. -orabidoo
*/ */
struct CapabilityIndex *serv_capindex = NULL; struct CapabilityIndex *serv_capindex = NULL;
struct CapabilityIndex *cli_capindex = NULL;
unsigned int CAP_CAP; unsigned int CAP_CAP;
unsigned int CAP_QS; unsigned int CAP_QS;
@ -106,29 +107,31 @@ init_builtin_capabs(void)
CAP_CAP = capability_put_anonymous(serv_capindex); CAP_CAP = capability_put_anonymous(serv_capindex);
CAP_TS6 = capability_put_anonymous(serv_capindex); CAP_TS6 = capability_put_anonymous(serv_capindex);
CAP_QS = capability_put(serv_capindex, "QS"); CAP_QS = capability_put(serv_capindex, "QS", NULL);
CAP_EX = capability_put(serv_capindex, "EX"); CAP_EX = capability_put(serv_capindex, "EX", NULL);
CAP_CHW = capability_put(serv_capindex, "CHW"); CAP_CHW = capability_put(serv_capindex, "CHW", NULL);
CAP_IE = capability_put(serv_capindex, "IE"); CAP_IE = capability_put(serv_capindex, "IE", NULL);
CAP_KLN = capability_put(serv_capindex, "KLN"); CAP_KLN = capability_put(serv_capindex, "KLN", NULL);
CAP_KNOCK = capability_put(serv_capindex, "KNOCK"); CAP_KNOCK = capability_put(serv_capindex, "KNOCK", NULL);
CAP_ZIP = capability_put(serv_capindex, "ZIP"); CAP_ZIP = capability_put(serv_capindex, "ZIP", NULL);
CAP_TB = capability_put(serv_capindex, "TB"); CAP_TB = capability_put(serv_capindex, "TB", NULL);
CAP_UNKLN = capability_put(serv_capindex, "UNKLN"); CAP_UNKLN = capability_put(serv_capindex, "UNKLN", NULL);
CAP_CLUSTER = capability_put(serv_capindex, "CLUSTER"); CAP_CLUSTER = capability_put(serv_capindex, "CLUSTER", NULL);
CAP_ENCAP = capability_put(serv_capindex, "ENCAP"); CAP_ENCAP = capability_put(serv_capindex, "ENCAP", NULL);
CAP_SERVICE = capability_put(serv_capindex, "SERVICES"); CAP_SERVICE = capability_put(serv_capindex, "SERVICES", NULL);
CAP_RSFNC = capability_put(serv_capindex, "RSFNC"); CAP_RSFNC = capability_put(serv_capindex, "RSFNC", NULL);
CAP_SAVE = capability_put(serv_capindex, "SAVE"); CAP_SAVE = capability_put(serv_capindex, "SAVE", NULL);
CAP_EUID = capability_put(serv_capindex, "EUID"); CAP_EUID = capability_put(serv_capindex, "EUID", NULL);
CAP_EOPMOD = capability_put(serv_capindex, "EOPMOD"); CAP_EOPMOD = capability_put(serv_capindex, "EOPMOD", NULL);
CAP_BAN = capability_put(serv_capindex, "BAN"); CAP_BAN = capability_put(serv_capindex, "BAN", NULL);
CAP_MLOCK = capability_put(serv_capindex, "MLOCK"); CAP_MLOCK = capability_put(serv_capindex, "MLOCK", NULL);
capability_require(serv_capindex, "QS"); capability_require(serv_capindex, "QS");
capability_require(serv_capindex, "EX"); capability_require(serv_capindex, "EX");
capability_require(serv_capindex, "IE"); capability_require(serv_capindex, "IE");
capability_require(serv_capindex, "ENCAP"); capability_require(serv_capindex, "ENCAP");
cli_capindex = capability_index_create("client capabilities");
} }
static CNCB serv_connect_callback; static CNCB serv_connect_callback;