#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(const struct CapabilityEntry *cap)
+clicap_visible(struct Client *client_p, const struct CapabilityEntry *cap)
{
struct ClientCapability *clicap;
if (clicap->visible == NULL)
return 1;
- return clicap->visible();
+ return clicap->visible(client_p);
}
/* clicap_find()
* Generates a list of capabilities.
*
* Inputs: client to send to, subcmd to send,
- * flags to match against: 0 to do none, -1 if client has no flags,
- * int to whether we are doing CAP CLEAR
+ * flags to match against: 0 to do none, -1 if client has no flags
* Outputs: None
*/
static void
-clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clear)
+clicap_generate(struct Client *source_p, const char *subcmd, int flags)
{
char buf[BUFSIZE] = { 0 };
char capbuf[BUFSIZE] = { 0 };
- char *p;
int buflen = 0;
- int curlen, mlen;
+ int mlen;
struct CapabilityEntry *entry;
- struct DictionaryIter iter;
+ rb_dictionary_iter 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)
{
return;
}
- DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict)
+ RB_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;
- /* they are capable of this, check sticky */
- else if(clear && HasCapabilityFlag(entry, CLICAP_FLAGS_STICKY))
- continue;
- }
+ if(flags && !IsCapableEntry(source_p, entry))
+ continue;
- if (!clicap_visible(entry))
+ if (!clicap_visible(source_p, entry))
continue;
caplen = strlen(entry->cap);
if (!flags && (source_p->flags & FLAGS_CLICAP_DATA) && clicap != NULL && clicap->data != NULL)
- data = clicap->data();
+ data = clicap->data(source_p);
if (data != NULL)
caplen += strlen(data) + 1;
/* \r\n\0, possible "-~=", space, " *" */
- if(buflen + caplen >= 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;
memset(capbuf, 0, sizeof capbuf);
}
- if(clear)
- {
- *p++ = '-';
- buflen++;
- }
-
- if (data == NULL)
- curlen = sprintf(p, "%s ", entry->cap);
- else
- curlen = sprintf(p, "%s=%s ", entry->cap, data);
-
- p += curlen;
- buflen += curlen;
+ buflen = rb_snprintf_append(capbuf, sizeof capbuf, "%s%s%s ",
+ 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);
}
source_p->localClient->caps &= ~capdel;
}
-static void
-cap_clear(struct Client *source_p, const char *arg)
-{
- clicap_generate(source_p, "ACK",
- source_p->localClient->caps ? source_p->localClient->caps : -1, 1);
-
- source_p->localClient->caps = 0;
-}
-
static void
cap_end(struct Client *source_p, const char *arg)
{
{
/* list of what theyre currently using */
clicap_generate(source_p, "LIST",
- source_p->localClient->caps ? source_p->localClient->caps : -1, 0);
+ source_p->localClient->caps ? source_p->localClient->caps : -1);
}
static void
}
/* list of what we support */
- clicap_generate(source_p, "LS", 0, 0);
+ clicap_generate(source_p, "LS", 0);
}
static void
}
else
{
- if (!clicap_visible(cap))
+ if (!clicap_visible(source_p, cap))
{
finished = 0;
break;
} clicap_cmdlist[] = {
/* This list *MUST* be in alphabetical order */
{ "ACK", cap_ack },
- { "CLEAR", cap_clear },
{ "END", cap_end },
{ "LIST", cap_list },
{ "LS", cap_ls },
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;
}