Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index 60b7e599535ae32ddd0e02dcfdbdd11a6da05457..efcaf7f254f9c99d6f66fee3edcd9aca3b5bf159 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -71,14 +71,6 @@
  *
  *  All unknown/unlisted modes are treated as type D.
  */
-/* ELIST=[tokens]:
- *
- * M = mask search
- * N = !mask search
- * U = user count search (< >)
- * C = creation time search (C> C<)
- * T = topic search (T> T<)
- */
 
 #include "stdinc.h"
 #include "client.h"
@@ -86,7 +78,10 @@
 #include "numeric.h"
 #include "ircd.h"
 #include "s_conf.h"
+#include "s_user.h"
 #include "supported.h"
+#include "chmode.h"
+#include "send.h"
 
 rb_dlink_list isupportlist;
 
@@ -103,27 +98,53 @@ add_isupport(const char *name, const char *(*func)(const void *), const void *pa
 {
        struct isupportitem *item;
 
-       item = MyMalloc(sizeof(struct isupportitem));
+       item = rb_malloc(sizeof(struct isupportitem));
        item->name = name;
        item->func = func;
        item->param = param;
        rb_dlinkAddTail(item, &item->node, &isupportlist);
 }
 
+const void *
+change_isupport(const char *name, const char *(*func)(const void *), const void *param)
+{
+       rb_dlink_node *ptr;
+       struct isupportitem *item;
+       const void *oldvalue = NULL;
+
+       RB_DLINK_FOREACH(ptr, isupportlist.head)
+       {
+               item = ptr->data;
+
+               if (!strcmp(item->name, name))
+               {
+                       oldvalue = item->param;
+
+                       // item->name = name;
+                       item->func = func;
+                       item->param = param;
+
+                       break;
+               }
+       }
+
+       return oldvalue;
+}
+
 void
 delete_isupport(const char *name)
 {
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
        struct isupportitem *item;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, isupportlist.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
        {
                item = ptr->data;
 
                if (!strcmp(item->name, name))
                {
                        rb_dlinkDelete(ptr, &isupportlist);
-                       MyFree(item);
+                       rb_free(item);
                }
        }
 }
@@ -162,12 +183,12 @@ show_isupport(struct Client *client_p)
                        nchars = extra_space, nparams = 0, buf[0] = '\0';
                }
                if (nparams > 0)
-                       strlcat(buf, " ", sizeof buf), nchars++;
-               strlcat(buf, item->name, sizeof buf);
+                       rb_strlcat(buf, " ", sizeof buf), nchars++;
+               rb_strlcat(buf, item->name, sizeof buf);
                if (!EmptyString(value))
                {
-                       strlcat(buf, "=", sizeof buf);
-                       strlcat(buf, value, sizeof buf);
+                       rb_strlcat(buf, "=", sizeof buf);
+                       rb_strlcat(buf, value, sizeof buf);
                }
                nchars += l;
                nparams++;
@@ -201,7 +222,17 @@ isupport_string(const void *ptr)
 const char *
 isupport_stringptr(const void *ptr)
 {
-       return *(char * const *)ptr;    
+       return *(char * const *)ptr;
+}
+
+static const char *
+isupport_umode(const void *ptr)
+{
+       const char *str;
+
+       str = ptr;
+       return ConfigFileEntry.oper_only_umodes &
+               user_modes[(unsigned char)*str] ? NULL : str;
 }
 
 static const char *
@@ -209,21 +240,27 @@ isupport_chanmodes(const void *ptr)
 {
        static char result[80];
 
-       rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,imnpst%scgzLP%s",
+       rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
                        ConfigChannel.use_except ? "e" : "",
                        ConfigChannel.use_invex ? "I" : "",
                        ConfigChannel.use_forward ? "f" : "",
-                       rb_dlink_list_length(&service_list) ? "r" : "",
-                       ConfigChannel.use_forward ? "QF" : "");
+                       cflagsbuf);
        return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.disable_local_channels ? "#" : "&#";
+}
+
 static const char *
 isupport_chanlimit(const void *ptr)
 {
        static char result[30];
 
-       rb_snprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
+       rb_snprintf(result, sizeof result, "%s:%i",
+               ConfigChannel.disable_local_channels ? "#" : "&#", ConfigChannel.max_chans_per_user);
        return result;
 }
 
@@ -263,15 +300,24 @@ 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_string, "&#");
+       add_isupport("CHANTYPES", isupport_chantypes, NULL);
        add_isupport("EXCEPTS", isupport_boolean, &ConfigChannel.use_except);
        add_isupport("INVEX", isupport_boolean, &ConfigChannel.use_invex);
        add_isupport("CHANMODES", isupport_chanmodes, NULL);
@@ -282,20 +328,20 @@ init_isupport(void)
        add_isupport("NETWORK", isupport_stringptr, &ServerInfo.network_name);
        add_isupport("KNOCK", isupport_boolean, &ConfigChannel.use_knock);
        add_isupport("STATUSMSG", isupport_string, "@+");
-       add_isupport("CALLERID", isupport_string, "g");
-       add_isupport("SAFELIST", isupport_string, "");
-       add_isupport("ELIST", isupport_string, "U");
+       add_isupport("CALLERID", isupport_umode, "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, "");
        add_isupport("CPRIVMSG", isupport_string, "");
        add_isupport("CNOTICE", isupport_string, "");
-       add_isupport("DEAF", isupport_string, "D");
+       add_isupport("DEAF", isupport_umode, "D");
        add_isupport("MONITOR", isupport_intptr, &ConfigFileEntry.max_monitor);
        add_isupport("FNC", isupport_string, "");
        add_isupport("TARGMAX", isupport_targmax, NULL);
        add_isupport("EXTBAN", isupport_extban, NULL);
+       add_isupport("WHOX", isupport_string, "");
+       add_isupport("CLIENTVER", isupport_string, "3.0");
 }