*
* Copyright (C) 2005 Lee Hardy <lee@leeh.co.uk>
* Copyright (C) 2005 ircd-ratbox development team
+ * Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: m_cap.c 676 2006-02-03 20:05:09Z gxti $
*/
#include "stdinc.h"
typedef int (*bqcmp)(const void *, const void *);
-static int m_cap(struct Client *, struct Client *, int, const char **);
-static int modinit(void);
+static int m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message cap_msgtab = {
- "CAP", 0, 0, 0, MFLG_SLOW,
+ "CAP", 0, 0, 0, 0,
{{m_cap, 2}, {m_cap, 2}, mg_ignore, mg_ignore, mg_ignore, {m_cap, 2}}
};
mapi_clist_av1 cap_clist[] = { &cap_msgtab, NULL };
-DECLARE_MODULE_AV1(cap, modinit, NULL, cap_clist, NULL, NULL, "$Revision: 676 $");
-
-#define _CLICAP(name, capserv, capclient, caprequired, flags) \
- { (name), (capserv), (capclient), (caprequired), (flags), sizeof(name) - 1 }
-
-#define CLICAP_FLAGS_STICKY 0x001
-
-static struct clicap
-{
- const char *name;
- int cap_serv; /* for altering s->c */
- int cap_cli; /* for altering c->s */
- int cap_required_serv; /* required dependency cap */
- int flags;
- int namelen;
-} clicap_list[] = {
- _CLICAP("multi-prefix", CLICAP_MULTI_PREFIX, 0, 0, 0),
- _CLICAP("sasl", CLICAP_SASL, 0, 0, CLICAP_FLAGS_STICKY),
- _CLICAP("account-notify", CLICAP_ACCOUNT_NOTIFY, 0, 0, 0),
- _CLICAP("extended-join", CLICAP_EXTENDED_JOIN, 0, 0, 0),
- _CLICAP("away-notify", CLICAP_AWAY_NOTIFY, 0, 0, 0),
- _CLICAP("tls", CLICAP_TLS, 0, 0, 0),
- _CLICAP("userhost-in-names", CLICAP_USERHOST_IN_NAMES, 0, 0, 0),
- _CLICAP("cap-notify", CLICAP_CAP_NOTIFY, 0, 0, 0),
-};
-
-#define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap))
-
-static int clicap_sort(struct clicap *, struct clicap *);
-
-static int
-modinit(void)
-{
- qsort(clicap_list, CLICAP_LIST_LEN, sizeof(struct clicap),
- (bqcmp) clicap_sort);
- return 0;
-}
-
-static int
-clicap_sort(struct clicap *one, struct clicap *two)
-{
- return irccmp(one->name, two->name);
-}
+DECLARE_MODULE_AV1(cap, NULL, NULL, cap_clist, NULL, NULL, "$Revision: 676 $");
-static int
-clicap_compare(const char *name, struct clicap *cap)
-{
- return irccmp(name, cap->name);
-}
+#define IsCapableEntry(c, e) IsCapable(c, 1 << (e)->value)
+#define HasCapabilityFlag(c, f) (c->ownerdata != NULL && (((struct ClientCapability *)c->ownerdata)->flags & (f)) == f)
/* clicap_find()
* Used iteratively over a buffer, extracts individual cap tokens.
* int pointer to whether we finish with success
* Ouputs: Cap entry if found, NULL otherwise.
*/
-static struct clicap *
+static struct CapabilityEntry *
clicap_find(const char *data, int *negate, int *finished)
{
static char buf[BUFSIZE];
static char *p;
- struct clicap *cap;
+ struct CapabilityEntry *cap;
char *s;
*negate = 0;
if((s = strchr(p, ' ')))
*s++ = '\0';
- if((cap = bsearch(p, clicap_list, CLICAP_LIST_LEN,
- sizeof(struct clicap), (bqcmp) clicap_compare)))
+ if((cap = capability_find(cli_capindex, p)) != NULL)
{
if(s)
p = s;
char *p;
int buflen = 0;
int curlen, mlen;
- size_t i;
+ struct CapabilityEntry *entry;
+ struct DictionaryIter iter;
- mlen = rb_sprintf(buf, ":%s CAP %s %s",
+ mlen = sprintf(buf, ":%s CAP %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
subcmd);
return;
}
- for(i = 0; i < CLICAP_LIST_LEN; i++)
+ DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict)
{
if(flags)
{
- if(!IsCapable(source_p, clicap_list[i].cap_serv))
+ if(!IsCapableEntry(source_p, entry))
continue;
/* they are capable of this, check sticky */
- else if(clear && clicap_list[i].flags & CLICAP_FLAGS_STICKY)
+ else if(clear && HasCapabilityFlag(entry, CLICAP_FLAGS_STICKY))
continue;
}
- if (clicap_list[i].cap_serv == CLICAP_SASL)
+ if ((1 << entry->value) == CLICAP_SASL)
{
struct Client *agent_p = NULL;
}
/* \r\n\0, possible "-~=", space, " *" */
- if(buflen + clicap_list[i].namelen >= BUFSIZE - 10)
+ if(buflen + strlen(entry->cap) >= BUFSIZE - 10)
{
/* remove our trailing space -- if buflen == mlen
* here, we didnt even succeed in adding one.
buflen++;
}
- curlen = rb_sprintf(p, "%s ", clicap_list[i].name);
+ curlen = sprintf(p, "%s ", entry->cap);
p += curlen;
buflen += curlen;
}
static void
cap_ack(struct Client *source_p, const char *arg)
{
- struct clicap *cap;
+ struct CapabilityEntry *cap;
int capadd = 0, capdel = 0;
int finished = 0, negate;
cap = clicap_find(NULL, &negate, &finished))
{
/* sent an ACK for something they havent REQd */
- if(!IsCapable(source_p, cap->cap_serv))
+ if(!IsCapableEntry(source_p, cap))
continue;
if(negate)
{
/* dont let them ack something sticky off */
- if(cap->flags & CLICAP_FLAGS_STICKY)
+ if(HasCapabilityFlag(cap, CLICAP_FLAGS_STICKY))
continue;
- capdel |= cap->cap_cli;
+ capdel |= (1 << cap->value);
}
else
- capadd |= cap->cap_cli;
+ capadd |= (1 << cap->value);
}
source_p->localClient->caps |= capadd;
clicap_generate(source_p, "ACK",
source_p->localClient->caps ? source_p->localClient->caps : -1, 1);
- /* XXX - sticky capabs */
-#ifdef CLICAP_STICKY
- source_p->localClient->caps = source_p->localClient->caps & CLICAP_STICKY;
-#else
source_p->localClient->caps = 0;
-#endif
}
static void
if(source_p->name[0] && source_p->flags & FLAGS_SENTUSER)
{
- char buf[USERLEN+1];
- rb_strlcpy(buf, source_p->username, sizeof(buf));
- register_local_user(source_p, source_p, buf);
+ register_local_user(source_p, source_p);
}
}
{
char buf[BUFSIZE];
char pbuf[2][BUFSIZE];
- struct clicap *cap;
+ struct CapabilityEntry *cap;
int buflen, plen;
int i = 0;
int capadd = 0, capdel = 0;
if(EmptyString(arg))
return;
- buflen = rb_snprintf(buf, sizeof(buf), ":%s CAP %s ACK",
+ buflen = snprintf(buf, sizeof(buf), ":%s CAP %s ACK",
me.name, EmptyString(source_p->name) ? "*" : source_p->name);
pbuf[0][0] = '\0';
for(cap = clicap_find(arg, &negate, &finished); cap;
cap = clicap_find(NULL, &negate, &finished))
{
+ size_t namelen = strlen(cap->cap);
+
/* filled the first array, but cant send it in case the
* request fails. one REQ should never fill more than two
* buffers --fl
*/
- if(buflen + plen + cap->namelen + 6 >= BUFSIZE)
+ if(buflen + plen + namelen + 6 >= BUFSIZE)
{
pbuf[1][0] = '\0';
plen = 0;
if(negate)
{
- if(cap->flags & CLICAP_FLAGS_STICKY)
+ if(HasCapabilityFlag(cap, CLICAP_FLAGS_STICKY))
{
finished = 0;
break;
strcat(pbuf[i], "-");
plen++;
- capdel |= cap->cap_serv;
+ capdel |= (1 << cap->value);
}
else
{
- if(cap->cap_required_serv && !((capadd & cap->cap_required_serv) == cap->cap_required_serv || IsCapable(source_p, cap->cap_required_serv)))
- {
- finished = 0;
- break;
- }
-
- if (cap->cap_serv == CLICAP_SASL)
+ if ((1 << cap->value) == CLICAP_SASL)
{
struct Client *agent_p = NULL;
}
}
- if(cap->flags & CLICAP_FLAGS_STICKY)
- {
- strcat(pbuf[i], "=");
- plen++;
- }
-
- capadd |= cap->cap_serv;
+ capadd |= (1 << cap->value);
}
- if(cap->cap_cli)
+ /* XXX this probably should exclude REQACK'd caps from capadd/capdel, but keep old behaviour for now */
+ if(HasCapabilityFlag(cap, CLICAP_FLAGS_REQACK))
{
strcat(pbuf[i], "~");
plen++;
}
- strcat(pbuf[i], cap->name);
- strcat(pbuf[i], " ");
- plen += (cap->namelen + 1);
+ strcat(pbuf[i], cap->cap);
+ if (!finished) {
+ strcat(pbuf[i], " ");
+ plen += (namelen + 1);
+ }
}
if(!finished)
}
static int
-m_cap(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_cap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct clicap_cmd *cmd;
projects / solanum.git / blobdiff