Correct error message involving no fingerprint credentials or password credentials...

[irc/rqf/shadowircd.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index 3a0b3e2fc5a1d09539e3294ee7cde82b8b041ab1..abeb60cf38784db4736594728ee79701470ddf3c 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -28,7 +28,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: supported.c 3568 2007-09-09 18:59:08Z jilles $
  */
 
 /* From the old supported.h which is
@@ -81,22 +80,22 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "common.h"
 #include "numeric.h"
 #include "ircd.h"
 #include "s_conf.h"
 #include "supported.h"
+#include "chmode.h"
 
-dlink_list isupportlist;
+rb_dlink_list isupportlist;
 
 struct isupportitem
 {
        const char *name;
        const char *(*func)(const void *);
        const void *param;
-       dlink_node node;
+       rb_dlink_node node;
 };
 
 void
@@ -104,27 +103,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;
-       dlinkAddTail(item, &item->node, &isupportlist);
+       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)
 {
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
        struct isupportitem *item;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
        {
                item = ptr->data;
 
                if (!strcmp(item->name, name))
                {
-                       dlinkDelete(ptr, &isupportlist);
-                       MyFree(item);
+                       rb_dlinkDelete(ptr, &isupportlist);
+                       rb_free(item);
                }
        }
 }
@@ -133,7 +158,7 @@ delete_isupport(const char *name)
 void
 show_isupport(struct Client *client_p)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct isupportitem *item;
        const char *value;
        char buf[512];
@@ -150,7 +175,7 @@ show_isupport(struct Client *client_p)
        extra_space += strlen(me.name) + 1 + strlen(form_str(RPL_ISUPPORT));
 
        nchars = extra_space, nparams = 0, buf[0] = '\0';
-       DLINK_FOREACH(ptr, isupportlist.head)
+       RB_DLINK_FOREACH(ptr, isupportlist.head)
        {
                item = ptr->data;
                value = (*item->func)(item->param);
@@ -163,12 +188,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++;
@@ -210,21 +235,43 @@ 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%sb%s,k,%sl%s,%s",
                        ConfigChannel.use_except ? "e" : "",
                        ConfigChannel.use_invex ? "I" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
                        ConfigChannel.use_forward ? "f" : "",
-                       dlink_list_length(&service_list) ? "r" : "",
-                       ConfigChannel.use_forward ? "QF" : "");
+                       strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
+                       cflagsbuf);
        return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.use_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.use_local_channels ? "&#" : "#", 
+                       ConfigChannel.max_chans_per_user);
+       return result;
+}
+
+static const char*
+isupport_prefix(const void *ptr)
+{
+       static char result[11];
+
+       rb_snprintf(result, sizeof result, "(%so%sv)%s@%s+",
+                       ConfigChannel.use_admin ? "a" : "",
+                       ConfigChannel.use_halfop ? "h" : "",
+                       ConfigChannel.use_admin ? "!" : "",
+                       ConfigChannel.use_halfop ? "%" : "");
        return result;
 }
 
@@ -272,12 +319,12 @@ init_isupport(void)
        static int channellen = LOC_CHANNELLEN;
        static int topiclen = TOPICLEN;
 
-       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);
        add_isupport("CHANLIMIT", isupport_chanlimit, NULL);
-       add_isupport("PREFIX", isupport_string, "(ov)@+");
+       add_isupport("PREFIX", isupport_prefix, NULL);
        add_isupport("MAXLIST", isupport_maxlist, NULL);
        add_isupport("MODES", isupport_intptr, &maxmodes);
        add_isupport("NETWORK", isupport_stringptr, &ServerInfo.network_name);
@@ -299,4 +346,6 @@ init_isupport(void)
        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");
 }