#include "s_conf.h"
#include "hash.h"
+static const char cap_desc[] = "Provides the commands used for client capability negotiation";
+
typedef int (*bqcmp)(const void *, const void *);
-static int m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message cap_msgtab = {
"CAP", 0, 0, 0, 0,
};
mapi_clist_av1 cap_clist[] = { &cap_msgtab, NULL };
-DECLARE_MODULE_AV1(cap, NULL, NULL, cap_clist, NULL, NULL, "$Revision: 676 $");
+
+DECLARE_MODULE_AV2(cap, NULL, NULL, cap_clist, NULL, NULL, NULL, NULL, cap_desc);
#define IsCapableEntry(c, e) IsCapable(c, 1 << (e)->value)
#define HasCapabilityFlag(c, f) (c->ownerdata != NULL && (((struct ClientCapability *)c->ownerdata)->flags & (f)) == f)
+static inline int
+clicap_visible(struct Client *client_p, const struct CapabilityEntry *cap)
+{
+ struct ClientCapability *clicap;
+
+ /* orphaned caps shouldn't be visible */
+ if (cap->flags & CAP_ORPHANED)
+ return 0;
+
+ if (cap->ownerdata == NULL)
+ return 1;
+
+ clicap = cap->ownerdata;
+ if (clicap->visible == NULL)
+ return 1;
+
+ return clicap->visible(client_p);
+}
+
/* clicap_find()
* Used iteratively over a buffer, extracts individual cap tokens.
*
static void
clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clear)
{
- char buf[BUFSIZE];
- char capbuf[BUFSIZE];
- char *p;
+ char buf[BUFSIZE] = { 0 };
+ char capbuf[BUFSIZE] = { 0 };
int buflen = 0;
int curlen, mlen;
struct CapabilityEntry *entry;
struct DictionaryIter iter;
- mlen = sprintf(buf, ":%s CAP %s %s",
+ mlen = snprintf(buf, sizeof buf, ":%s CAP %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
subcmd);
- p = capbuf;
- buflen = mlen;
-
/* shortcut, nothing to do */
if(flags == -1)
{
DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict)
{
+ size_t caplen = 0;
+ struct ClientCapability *clicap = entry->ownerdata;
+ const char *data = NULL;
+
if(flags)
{
if(!IsCapableEntry(source_p, entry))
continue;
}
- if ((1 << entry->value) == CLICAP_SASL)
- {
- struct Client *agent_p = NULL;
+ if (!clicap_visible(source_p, entry))
+ continue;
- if (!ConfigFileEntry.sasl_service)
- continue;
+ caplen = strlen(entry->cap);
+ if (!flags && (source_p->flags & FLAGS_CLICAP_DATA) && clicap != NULL && clicap->data != NULL)
+ data = clicap->data(source_p);
- agent_p = find_named_client(ConfigFileEntry.sasl_service);
- if (agent_p == NULL || !IsService(agent_p))
- continue;
- }
+ if (data != NULL)
+ caplen += strlen(data) + 1;
/* \r\n\0, possible "-~=", space, " *" */
- if(buflen + strlen(entry->cap) >= BUFSIZE - 10)
+ if(buflen + mlen >= BUFSIZE - 10)
{
/* remove our trailing space -- if buflen == mlen
* here, we didnt even succeed in adding one.
*/
- if(buflen != mlen)
- *(p - 1) = '\0';
- else
- *p = '\0';
+ capbuf[buflen] = '\0';
sendto_one(source_p, "%s * :%s", buf, capbuf);
- p = capbuf;
- buflen = mlen;
- }
- if(clear)
- {
- *p++ = '-';
- buflen++;
+ buflen = mlen;
+ memset(capbuf, 0, sizeof capbuf);
}
- curlen = sprintf(p, "%s ", entry->cap);
- p += curlen;
- buflen += curlen;
+ buflen = rb_snprintf_append(capbuf, sizeof capbuf, "%s%s%s%s ",
+ clear ? "-" : "", entry->cap, data != NULL ? "=" : "", data != NULL ? data : "");
}
/* remove trailing space */
- if(buflen != mlen)
- *(p - 1) = '\0';
- else
- *p = '\0';
+ capbuf[buflen] = '\0';
sendto_one(source_p, "%s :%s", buf, capbuf);
}
if(!IsRegistered(source_p))
source_p->flags |= FLAGS_CLICAP;
+ if (arg != NULL && !strcmp(arg, "302"))
+ {
+ source_p->flags |= FLAGS_CLICAP_DATA;
+ source_p->localClient->caps |= CLICAP_CAP_NOTIFY;
+ }
+
/* list of what we support */
clicap_generate(source_p, "LS", 0, 0);
}
}
else
{
- if ((1 << cap->value) == CLICAP_SASL)
+ if (!clicap_visible(source_p, cap))
{
- struct Client *agent_p = NULL;
-
- if (!ConfigFileEntry.sasl_service)
- {
- finished = 0;
- break;
- }
-
- agent_p = find_named_client(ConfigFileEntry.sasl_service);
- if (agent_p == NULL || !IsService(agent_p))
- {
- finished = 0;
- break;
- }
+ finished = 0;
+ break;
}
capadd |= (1 << cap->value);
return irccmp(command, entry->cmd);
}
-static int
+static void
m_cap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct clicap_cmd *cmd;
sendto_one(source_p, form_str(ERR_INVALIDCAPCMD),
me.name, EmptyString(source_p->name) ? "*" : source_p->name,
parv[1]);
- return 0;
+ return;
}
(cmd->func)(source_p, parv[2]);
- return 0;
}