capability: store capability bit entries with actual bit numbers, instead of as an...

[solanum.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index f227ddd7e24244ea9a26f229ee279b4f366869d5..3a4ed07420b1f8c3852c66c8cef6d161d032b003 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -288,13 +288,22 @@ isupport_extban(const void *ptr)
        return result;
 }
 
+static const char *
+isupport_nicklen(const void *ptr)
+{
+       static char result[200];
+
+       rb_snprintf(result, sizeof result, "%u", ConfigFileEntry.nicklen - 1);
+       return result;
+}
+
 void
 init_isupport(void)
 {
        static int maxmodes = MAXMODEPARAMS;
-       static int nicklen = NICKLEN-1;
        static int channellen = LOC_CHANNELLEN;
        static int topiclen = TOPICLEN;
+       static int maxnicklen = NICKLEN - 1;
 
        add_isupport("CHANTYPES", isupport_chantypes, NULL);
        add_isupport("EXCEPTS", isupport_boolean, &ConfigChannel.use_except);
@@ -310,7 +319,8 @@ init_isupport(void)
        add_isupport("CALLERID", isupport_string, "g");
        add_isupport("CASEMAPPING", isupport_string, "rfc1459");
        add_isupport("CHARSET", isupport_string, "ascii");
-       add_isupport("NICKLEN", isupport_intptr, &nicklen);
+       add_isupport("NICKLEN", isupport_nicklen, NULL);
+       add_isupport("MAXNICKLEN", isupport_intptr, &maxnicklen);
        add_isupport("CHANNELLEN", isupport_intptr, &channellen);
        add_isupport("TOPICLEN", isupport_intptr, &topiclen);
        add_isupport("ETRACE", isupport_string, "");
@@ -322,6 +332,5 @@ init_isupport(void)
        add_isupport("TARGMAX", isupport_targmax, NULL);
        add_isupport("EXTBAN", isupport_extban, NULL);
        add_isupport("WHOX", isupport_string, "");
-       add_isupport("CHANROLES", isupport_string, "");
        add_isupport("CLIENTVER", isupport_string, "3.0");
 }