X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/aae358c078f54cdbaf87f98b5839b6994d93d3a0..9b8e9eb32116eb171a951fbbe93c53f1047c9a34:/modules/m_info.c diff --git a/modules/m_info.c b/modules/m_info.c index 3ec6e139..733df8be 100644 --- a/modules/m_info.c +++ b/modules/m_info.c @@ -20,8 +20,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: m_info.c 3396 2007-04-05 00:38:52Z jilles $ */ #include "stdinc.h" @@ -29,7 +27,7 @@ #include "channel.h" #include "client.h" #include "common.h" -#include "irc_string.h" +#include "match.h" #include "ircd.h" #include "hook.h" #include "numeric.h" @@ -41,16 +39,19 @@ #include "parse.h" #include "modules.h" +static const char info_desc[] = + "Provides the INFO command for retrieving server copyright, credits, and other info"; + static void send_conf_options(struct Client *source_p); static void send_birthdate_online_time(struct Client *source_p); static void send_info_text(struct Client *source_p); static void info_spy(struct Client *); -static int m_info(struct Client *, struct Client *, int, const char **); -static int mo_info(struct Client *, struct Client *, int, const char **); +static void m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message info_msgtab = { - "INFO", 0, 0, 0, MFLG_SLOW, + "INFO", 0, 0, 0, 0, {mg_unreg, {m_info, 0}, {mo_info, 0}, mg_ignore, mg_ignore, {mo_info, 0}} }; @@ -62,7 +63,7 @@ mapi_hlist_av1 info_hlist[] = { { NULL, NULL } }; -DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3396 $"); +DECLARE_MODULE_AV2(info, NULL, NULL, info_clist, info_hlist, NULL, NULL, NULL, info_desc); /* * jdc -- Structure for our configuration value table @@ -91,11 +92,11 @@ static struct InfoStruct info_table[] = { &opers_see_all_users, "Farconnect notices available or operspy accountability limited" }, - { - "max_connections", - OUTPUT_DECIMAL, - &maxconnections, - "Max number connections" + { + "max_connections", + OUTPUT_DECIMAL, + &maxconnections, + "Max number connections" }, { "anti_nick_flood", @@ -119,20 +120,50 @@ static struct InfoStruct info_table[] = { "client_exit", OUTPUT_BOOLEAN, &ConfigFileEntry.client_exit, - "Prepend 'Client Exit:' to user QUIT messages" + "Prepend 'Quit:' to user QUIT messages" }, { - "client_flood", + "client_flood_max_lines", OUTPUT_DECIMAL, - &ConfigFileEntry.client_flood, + &ConfigFileEntry.client_flood_max_lines, "Number of lines before a client Excess Flood's", }, + { + "client_flood_burst_rate", + OUTPUT_DECIMAL, + &ConfigFileEntry.client_flood_burst_rate, + "Maximum lines per second during flood grace period", + }, + { + "client_flood_burst_max", + OUTPUT_DECIMAL, + &ConfigFileEntry.client_flood_burst_max, + "Number of lines to process at once before delaying", + }, + { + "client_flood_message_num", + OUTPUT_DECIMAL, + &ConfigFileEntry.client_flood_message_num, + "Number of messages to allow per client_flood_message_time outside of burst", + }, + { + "client_flood_message_time", + OUTPUT_DECIMAL, + &ConfigFileEntry.client_flood_message_time, + "Time to allow per client_flood_message_num outside of burst", + }, { "connect_timeout", OUTPUT_DECIMAL, &ConfigFileEntry.connect_timeout, "Connect timeout for connections to servers" }, + { + "default_ident_timeout", + OUTPUT_DECIMAL, + &ConfigFileEntry.default_ident_timeout, + "Amount of time the server waits for ident responses from clients", + }, { "default_floodcount", OUTPUT_DECIMAL, @@ -212,6 +243,12 @@ static struct InfoStruct info_table[] = { &ConfigFileEntry.fname_serverlog, "Server connect/disconnect log file" }, + { + "fname_killlog", + OUTPUT_STRING, + &ConfigFileEntry.fname_killlog, + "KILL log file" + }, { "fname_klinelog", OUTPUT_STRING, @@ -320,12 +357,6 @@ static struct InfoStruct info_table[] = { &ServerInfo.network_name, "Network name" }, - { - "network_desc", - OUTPUT_STRING, - &ServerInfo.network_desc, - "Network description" - }, { "nick_delay", OUTPUT_DECIMAL, @@ -377,7 +408,7 @@ static struct InfoStruct info_table[] = { { "reject_after_count", OUTPUT_DECIMAL, - &ConfigFileEntry.reject_after_count, + &ConfigFileEntry.reject_after_count, "Client rejection threshold setting", }, { @@ -446,6 +477,18 @@ static struct InfoStruct info_table[] = { &ConfigFileEntry.stats_y_oper_only, "STATS Y is only shown to operators", }, + { + "throttle_count", + OUTPUT_DECIMAL, + &ConfigFileEntry.throttle_count, + "Connection throttle threshold", + }, + { + "throttle_duration", + OUTPUT_DECIMAL, + &ConfigFileEntry.throttle_duration, + "Connection throttle duration", + }, { "tkline_expire_notices", OUTPUT_BOOLEAN, @@ -468,7 +511,25 @@ static struct InfoStruct info_table[] = { "warn_no_nline", OUTPUT_BOOLEAN, &ConfigFileEntry.warn_no_nline, - "Display warning if connecting server lacks N-line" + "Display warning if connecting server lacks connect block" + }, + { + "use_propagated_bans", + OUTPUT_BOOLEAN, + &ConfigFileEntry.use_propagated_bans, + "KLINE sets fully propagated bans" + }, + { + "max_ratelimit_tokens", + OUTPUT_DECIMAL, + &ConfigFileEntry.max_ratelimit_tokens, + "The maximum number of tokens that can be accumulated for executing rate-limited commands", + }, + { + "away_interval", + OUTPUT_DECIMAL, + &ConfigFileEntry.away_interval, + "The minimum time between aways", }, { "default_split_server_count", @@ -500,6 +561,12 @@ static struct InfoStruct info_table[] = { &ConfigChannel.kick_on_split_riding, "Kick users riding splits to join +i or +k channels" }, + { + "disable_local_channels", + OUTPUT_BOOLEAN_YN, + &ConfigChannel.disable_local_channels, + "Disable local channels (&channels)" + }, { "max_bans", OUTPUT_DECIMAL, @@ -518,6 +585,12 @@ static struct InfoStruct info_table[] = { &ConfigChannel.max_chans_per_user, "Maximum number of channels a user can join", }, + { + "max_chans_per_user_large", + OUTPUT_DECIMAL, + &ConfigChannel.max_chans_per_user_large, + "Maximum extended number of channels a user can join", + }, { "no_create_on_split", OUTPUT_BOOLEAN_YN, @@ -530,6 +603,12 @@ static struct InfoStruct info_table[] = { &ConfigChannel.no_join_on_split, "Disallow joining channels when split", }, + { + "only_ascii_channels", + OUTPUT_BOOLEAN_YN, + &ConfigChannel.only_ascii_channels, + "Controls whether non-ASCII is disabled for JOIN" + }, { "use_except", OUTPUT_BOOLEAN_YN, @@ -554,6 +633,12 @@ static struct InfoStruct info_table[] = { &ConfigChannel.use_knock, "Enable /KNOCK", }, + { + "resv_forcepart", + OUTPUT_BOOLEAN_YN, + &ConfigChannel.resv_forcepart, + "Force-part local users on channel RESV" + }, { "disable_hidden", OUTPUT_BOOLEAN_YN, @@ -584,12 +669,11 @@ static struct InfoStruct info_table[] = { /* *INDENT-ON* */ /* -** m_info -** parv[0] = sender prefix -** parv[1] = servername -*/ -static int -m_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) + ** m_info + ** parv[1] = servername + */ +static void +m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -597,33 +681,30 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p { /* safe enough to give this on a local connect only */ sendto_one(source_p, form_str(RPL_LOAD2HI), - me.name, source_p->name, "INFO"); + me.name, source_p->name, "INFO"); sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO)); - return 0; + return; } else last_used = rb_current_time(); if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) != HUNTED_ISME) - return 0; + return; info_spy(source_p); - SetCork(source_p); send_info_text(source_p); send_birthdate_online_time(source_p); sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO)); - return 0; } /* -** mo_info -** parv[0] = sender prefix -** parv[1] = servername -*/ -static int -mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) + ** mo_info + ** parv[1] = servername + */ +static void +mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME) { @@ -631,14 +712,16 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char * send_info_text(source_p); if(IsOper(source_p)) + { send_conf_options(source_p); + sendto_one_numeric(source_p, RPL_INFO, ":%s", + rb_lib_version()); + } send_birthdate_online_time(source_p); sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO)); } - - return 0; } /* @@ -671,13 +754,14 @@ send_info_text(struct Client *source_p) static void send_birthdate_online_time(struct Client *source_p) { + char tbuf[26]; /* this needs to be 26 - see ctime_r manpage */ sendto_one(source_p, ":%s %d %s :Birth Date: %s, compile # %s", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), creation, generation); + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), creation, generation); sendto_one(source_p, ":%s %d %s :On-line since %s", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), myctime(startup_time)); + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), rb_ctime(startup_time, tbuf, sizeof(tbuf))); } /* @@ -695,25 +779,25 @@ send_conf_options(struct Client *source_p) /* * Now send them a list of all our configuration options - * (mostly from config.h) + * (mostly from defaults.h) */ for (infoptr = MyInformation; infoptr->name; infoptr++) { if(infoptr->intvalue) { - sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - infoptr->name, infoptr->intvalue, - infoptr->desc); + sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + infoptr->name, infoptr->intvalue, + infoptr->desc); } else { - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - infoptr->name, infoptr->strvalue, - infoptr->desc); + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + infoptr->name, infoptr->strvalue, + infoptr->desc); } } @@ -724,98 +808,98 @@ send_conf_options(struct Client *source_p) { switch (info_table[i].output_type) { - /* - * For "char *" references - */ - case OUTPUT_STRING: - { - char *option = *((char **) info_table[i].option); - - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - info_table[i].name, - option ? option : "NONE", - info_table[i].desc ? info_table[i].desc : ""); - - break; - } - /* - * For "char foo[]" references - */ - case OUTPUT_STRING_PTR: - { - char *option = (char *) info_table[i].option; - - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - info_table[i].name, - EmptyString(option) ? "NONE" : option, - info_table[i].desc ? info_table[i].desc : ""); - - break; - } - /* - * Output info_table[i].option as a decimal value. - */ - case OUTPUT_DECIMAL: - { - int option = *((int *) info_table[i].option); - - sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - info_table[i].name, - option, - info_table[i].desc ? info_table[i].desc : ""); - - break; - } - - /* - * Output info_table[i].option as "ON" or "OFF" - */ - case OUTPUT_BOOLEAN: - { - int option = *((int *) info_table[i].option); - - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - info_table[i].name, - option ? "ON" : "OFF", - info_table[i].desc ? info_table[i].desc : ""); - - break; - } - /* - * Output info_table[i].option as "YES" or "NO" - */ - case OUTPUT_BOOLEAN_YN: - { - int option = *((int *) info_table[i].option); - - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - get_id(&me, source_p), RPL_INFO, - get_id(source_p, source_p), - info_table[i].name, - option ? "YES" : "NO", - info_table[i].desc ? info_table[i].desc : ""); - - break; - } - - case OUTPUT_BOOLEAN2: - { - int option = *((int *) info_table[i].option); - - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", - me.name, RPL_INFO, source_p->name, - info_table[i].name, - option ? ((option == 1) ? "MASK" : "YES") : "NO", - info_table[i].desc ? info_table[i].desc : ""); - } /* switch (info_table[i].output_type) */ + /* + * For "char *" references + */ + case OUTPUT_STRING: + { + char *option = *((char **) info_table[i].option); + + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + info_table[i].name, + option ? option : "NONE", + info_table[i].desc ? info_table[i].desc : ""); + + break; + } + /* + * For "char foo[]" references + */ + case OUTPUT_STRING_PTR: + { + char *option = (char *) info_table[i].option; + + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + info_table[i].name, + EmptyString(option) ? "NONE" : option, + info_table[i].desc ? info_table[i].desc : ""); + + break; + } + /* + * Output info_table[i].option as a decimal value. + */ + case OUTPUT_DECIMAL: + { + int option = *((int *) info_table[i].option); + + sendto_one(source_p, ":%s %d %s :%-30s %-16d [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + info_table[i].name, + option, + info_table[i].desc ? info_table[i].desc : ""); + + break; + } + + /* + * Output info_table[i].option as "ON" or "OFF" + */ + case OUTPUT_BOOLEAN: + { + int option = *((int *) info_table[i].option); + + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + info_table[i].name, + option ? "ON" : "OFF", + info_table[i].desc ? info_table[i].desc : ""); + + break; + } + /* + * Output info_table[i].option as "YES" or "NO" + */ + case OUTPUT_BOOLEAN_YN: + { + int option = *((int *) info_table[i].option); + + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + get_id(&me, source_p), RPL_INFO, + get_id(source_p, source_p), + info_table[i].name, + option ? "YES" : "NO", + info_table[i].desc ? info_table[i].desc : ""); + + break; + } + + case OUTPUT_BOOLEAN2: + { + int option = *((int *) info_table[i].option); + + sendto_one(source_p, ":%s %d %s :%-30s %-16s [%s]", + me.name, RPL_INFO, source_p->name, + info_table[i].name, + option ? ((option == 1) ? "MASK" : "YES") : "NO", + info_table[i].desc ? info_table[i].desc : ""); + } /* switch (info_table[i].output_type) */ } } /* forloop */ @@ -828,7 +912,7 @@ send_conf_options(struct Client *source_p) } /* info_spy() - * + * * input - pointer to client * output - none * side effects - hook doing_info is called