X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/1f112a04f4dfbdde24b9d549b0f8772184c2869e..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_capab.c

diff --git a/modules/m_capab.c b/modules/m_capab.c
index 7a86835d..b03fb3fd 100644
--- a/modules/m_capab.c
+++ b/modules/m_capab.c
@@ -1,6 +1,6 @@
 /*
  *  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
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "msg.h"
@@ -38,7 +38,7 @@ static int me_gcap(struct Client *, struct Client *, int, const char **);
 
 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,
@@ -50,14 +50,12 @@ DECLARE_MODULE_AV1(capab, NULL, NULL, capab_clist, NULL, NULL, "$Revision: 1295
 
 /*
  * 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;
@@ -78,23 +76,14 @@ mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char
 	else
 		client_p->localClient->caps |= CAP_CAP;
 
-	MyFree(client_p->localClient->fullcaps);
-	DupString(client_p->localClient->fullcaps, parv[1]);
+	rb_free(client_p->localClient->fullcaps);
+	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;
@@ -104,7 +93,6 @@ static int
 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;
@@ -116,22 +104,13 @@ me_gcap(struct Client *client_p, struct Client *source_p,
 	if(!EmptyString(source_p->serv->fullcaps))
 	{
 		source_p->serv->caps = 0;
-		MyFree(source_p->serv->fullcaps);
+		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;
 }