#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;
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 *
{
static char result[80];
- rb_snprintf(result, sizeof result, "%s%sbq,k,flj,%s",
+ rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
ConfigChannel.use_except ? "e" : "",
ConfigChannel.use_invex ? "I" : "",
+ ConfigChannel.use_forward ? "f" : "",
cflagsbuf);
return result;
}
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);
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("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);