*
* Copyright (C) 2005 Lee Hardy <lee@leeh.co.uk>
* Copyright (C) 2005 ircd-ratbox development team
- * Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
static void
clicap_generate(struct Client *source_p, const char *subcmd, int flags)
{
- static char buf_prefix[DATALEN + 1];
- static char buf_list[DATALEN + 1];
- const char *str_cont = " * :";
- const char *str_final = " :";
- int len_prefix;
- int max_list;
+ const char *str_cont = "* :";
+ const char *str_final = ":";
struct CapabilityEntry *entry;
rb_dictionary_iter iter;
+ bool multiline_ret;
+ enum multiline_item_result multiline_item_ret;
- buf_prefix[0] = '\0';
- len_prefix = rb_snprintf_try_append(buf_prefix, sizeof(buf_prefix),
- ":%s CAP %s %s",
+ multiline_ret = send_multiline_init(source_p, " ", ":%s CAP %s %s %s",
me.name,
EmptyString(source_p->name) ? "*" : source_p->name,
- subcmd);
+ subcmd,
+ (source_p->flags & FLAGS_CLICAP_DATA) ? str_cont : str_final);
/* shortcut, nothing to do */
- if (flags == -1 || len_prefix < 0) {
- sendto_one(source_p, "%s%s", buf_prefix, str_final);
+ if (flags == -1 || !multiline_ret) {
+ sendto_one(source_p, ":%s CAP %s %s %s",
+ me.name,
+ EmptyString(source_p->name) ? "*" : source_p->name,
+ subcmd,
+ str_final);
return;
}
- buf_list[0] = '\0';
- max_list = sizeof(buf_prefix) - len_prefix - strlen(str_cont);
-
+ for (int pass = 0; pass < 2; pass++)
RB_DICTIONARY_FOREACH(entry, &iter, cli_capindex->cap_dict) {
struct ClientCapability *clicap = entry->ownerdata;
const char *data = NULL;
+ if (pass == 0 && !HasCapabilityFlag(entry, CLICAP_FLAGS_PRIORITY))
+ continue;
+ else if (pass == 1 && HasCapabilityFlag(entry, CLICAP_FLAGS_PRIORITY))
+ continue;
+
+ if (!IsCapableEntry(source_p, entry) && ConfigFileEntry.hidden_caps != NULL)
+ {
+ size_t i;
+ for (i = 0; ConfigFileEntry.hidden_caps[i] != NULL; i++)
+ {
+ if (!rb_strcasecmp(entry->cap, ConfigFileEntry.hidden_caps[i]))
+ break;
+ }
+ if (ConfigFileEntry.hidden_caps[i] != NULL)
+ continue;
+ }
+
if (flags && !IsCapableEntry(source_p, entry))
continue;
if (!clicap_visible(source_p, entry))
continue;
- if (!flags && (source_p->flags & FLAGS_CLICAP_DATA) && clicap != NULL && clicap->data != NULL)
- data = clicap->data(source_p);
+ if (source_p->flags & FLAGS_CLICAP_DATA) {
+ if (!flags && clicap != NULL && clicap->data != NULL)
+ data = clicap->data(source_p);
- for (int attempts = 0; attempts < 2; attempts++) {
- if (rb_snprintf_try_append(buf_list, max_list, "%s%s%s%s",
- buf_list[0] == '\0' ? "" : " ", /* space between caps */
+ multiline_item_ret = send_multiline_item(source_p, "%s%s%s",
entry->cap,
- data != NULL ? "=" : "", /* '=' between cap and data */
- data != NULL ? data : "") < 0
- && buf_list[0] != '\0') {
-
- if (!(source_p->flags & FLAGS_CLICAP_DATA)) {
- /* the client doesn't support multiple lines */
- break;
- }
+ data != NULL ? "=" : "",
+ data != NULL ? data : "");
- /* doesn't fit in the buffer, output what we have */
- sendto_one(source_p, "%s%s%s", buf_prefix, str_cont, buf_list);
+ if (multiline_item_ret == MULTILINE_FAILURE)
+ return;
+ } else {
+ multiline_item_ret = send_multiline_item(source_p, "%s", entry->cap);
- /* reset the buffer and go around the loop one more time */
- buf_list[0] = '\0';
- } else {
- break;
+ if (multiline_item_ret != MULTILINE_SUCCESS) {
+ send_multiline_reset();
+ return;
}
}
}
- sendto_one(source_p, "%s%s%s", buf_prefix, str_final, buf_list);
+ send_multiline_fini(source_p, ":%s CAP %s %s %s",
+ me.name,
+ EmptyString(source_p->name) ? "*" : source_p->name,
+ subcmd,
+ str_final);
}
static void
static void
cap_req(struct Client *source_p, const char *arg)
{
- static char buf_prefix[DATALEN + 1];
- static char buf_list[2][DATALEN + 1];
- const char *str_cont = " * :";
- const char *str_final = " :";
- int len_prefix;
- int max_list;
+ char ack_buf[DATALEN+1];
struct CapabilityEntry *cap;
- int i = 0;
int capadd = 0, capdel = 0;
int finished = 0, negate;
+ int ret;
+ hook_data_cap_change hdata;
if(!IsRegistered(source_p))
source_p->flags |= FLAGS_CLICAP;
if(EmptyString(arg))
return;
- buf_prefix[0] = '\0';
- len_prefix = rb_snprintf_try_append(buf_prefix, sizeof(buf_prefix),
- ":%s CAP %s ACK",
- me.name,
- EmptyString(source_p->name) ? "*" : source_p->name);
+ ret = snprintf(ack_buf, sizeof ack_buf, ":%s CAP %s ACK :%s",
+ me.name, EmptyString(source_p->name)? "*" : source_p->name, arg);
- buf_list[0][0] = '\0';
- buf_list[1][0] = '\0';
- max_list = sizeof(buf_prefix) - len_prefix - strlen(str_cont);
+ if (ret < 0 || ret > DATALEN)
+ {
+ sendto_one(source_p, ":%s CAP %s NAK :%s",
+ me.name, EmptyString(source_p->name) ? "*" : source_p->name, arg);
+ return;
+ }
for(cap = clicap_find(arg, &negate, &finished); cap;
cap = clicap_find(NULL, &negate, &finished))
{
- size_t namelen = strlen(cap->cap);
- const char *type;
-
if(negate)
{
if(HasCapabilityFlag(cap, CLICAP_FLAGS_STICKY))
break;
}
- type = "-";
capdel |= (1 << cap->value);
}
else
break;
}
- type = "";
capadd |= (1 << cap->value);
}
- /* XXX this probably should exclude REQACK'd caps from capadd/capdel, but keep old behaviour for now */
- if(HasCapabilityFlag(cap, CLICAP_FLAGS_REQACK))
- {
- type = "~";
- }
-
- for (int attempts = 0; attempts < 2; attempts++) {
- if (rb_snprintf_try_append(buf_list[i], max_list, "%s%s%s",
- buf_list[i][0] == '\0' ? "" : " ", /* space between caps */
- type,
- cap->cap) < 0
- && buf_list[i][0] != '\0') {
-
- if (!(source_p->flags & FLAGS_CLICAP_DATA)) {
- /* the client doesn't support multiple lines */
- break;
- }
-
- /* doesn't fit in the buffer, move to the next one */
- if (i < 2) {
- i++;
- } else {
- /* uh-oh */
- break;
- }
-
- /* reset the buffer and go around the loop one more time */
- buf_list[i][0] = '\0';
- } else {
- break;
- }
- }
}
if(!finished)
return;
}
- if (i) {
- sendto_one(source_p, "%s%s%s", buf_prefix, str_cont, buf_list[0]);
- sendto_one(source_p, "%s%s%s", buf_prefix, str_final, buf_list[1]);
- } else {
- sendto_one(source_p, "%s%s%s", buf_prefix, str_final, buf_list[0]);
- }
+ sendto_one(source_p, "%s", ack_buf);
+
+ hdata.client = source_p;
+ hdata.oldcaps = source_p->localClient->caps;
+ hdata.add = capadd;
+ hdata.del = capdel;
source_p->localClient->caps |= capadd;
source_p->localClient->caps &= ~capdel;
+
+ call_hook(h_cap_change, &hdata);
}
static struct clicap_cmd
projects / solanum.git / blobdiff