/*
* ircd-ratbox: A slightly useful ircd.
- * m_away.c: Negotiates capabilities with a remote server.
+ * m_capab.c: Negotiates capabilities with a remote server.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
#include "stdinc.h"
#include "client.h"
-#include "irc_string.h"
+#include "match.h"
#include "s_serv.h"
#include "s_conf.h"
#include "msg.h"
struct Message capab_msgtab = {
"CAPAB", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
- {{mr_capab, 0}, mg_ignore, mg_ignore, mg_ignore, mg_ignore, mg_ignore}
+ {{mr_capab, 2}, mg_ignore, mg_ignore, mg_ignore, mg_ignore, mg_ignore}
};
struct Message gcap_msgtab = {
"GCAP", 0, 0, 0, MFLG_SLOW,
/*
* mr_capab - CAPAB message handler
- * parv[0] = sender prefix
* parv[1] = space-separated list of capabilities
*
*/
static int
mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- struct Capability *cap;
int i;
char *p;
char *s;
client_p->localClient->caps |= CAP_CAP;
rb_free(client_p->localClient->fullcaps);
- DupString(client_p->localClient->fullcaps, parv[1]);
+ client_p->localClient->fullcaps = rb_strdup(parv[1]);
for (i = 1; i < parc; i++)
{
char *t = LOCAL_COPY(parv[i]);
- for (s = strtoken(&p, t, " "); s; s = strtoken(&p, NULL, " "))
- {
- for (cap = captab; cap->name; cap++)
- {
- if(!irccmp(cap->name, s))
- {
- client_p->localClient->caps |= cap->cap;
- break;
- }
- }
- }
+ for (s = rb_strtok_r(t, " ", &p); s; s = rb_strtok_r(NULL, " ", &p))
+ client_p->localClient->caps |= capability_get(serv_capindex, s);
}
return 0;
me_gcap(struct Client *client_p, struct Client *source_p,
int parc, const char *parv[])
{
- struct Capability *cap;
char *t = LOCAL_COPY(parv[1]);
char *s;
char *p;
rb_free(source_p->serv->fullcaps);
}
- DupString(source_p->serv->fullcaps, parv[1]);
+ source_p->serv->fullcaps = rb_strdup(parv[1]);
- for (s = strtoken(&p, t, " "); s; s = strtoken(&p, NULL, " "))
- {
- for (cap = captab; cap->name; cap++)
- {
- if(!irccmp(cap->name, s))
- {
- source_p->serv->caps |= cap->cap;
- break;
- }
- }
- }
+ for (s = rb_strtok_r(t, " ", &p); s; s = rb_strtok_r(NULL, " ", &p))
+ source_p->serv->caps |= capability_get(serv_capindex, s);
return 0;
}