X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/e6e54763d9654d6c1012172d5af6cc3b4a0e40a3..9b8e9eb32116eb171a951fbbe93c53f1047c9a34:/modules/m_info.c diff --git a/modules/m_info.c b/modules/m_info.c index 08e2f470..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" @@ -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 @@ -119,7 +120,7 @@ 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_max_lines", @@ -131,13 +132,13 @@ static struct InfoStruct info_table[] = { "client_flood_burst_rate", OUTPUT_DECIMAL, &ConfigFileEntry.client_flood_burst_rate, - "Rate at which burst lines are processed", + "Maximum lines per second during flood grace period", }, { "client_flood_burst_max", OUTPUT_DECIMAL, &ConfigFileEntry.client_flood_burst_max, - "Number of lines to permit at client_flood_burst_rate", + "Number of lines to process at once before delaying", }, { "client_flood_message_num", @@ -242,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, @@ -350,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, @@ -407,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", }, { @@ -479,13 +480,13 @@ static struct InfoStruct info_table[] = { { "throttle_count", OUTPUT_DECIMAL, - &ConfigFileEntry.throttle_count, + &ConfigFileEntry.throttle_count, "Connection throttle threshold", }, { "throttle_duration", OUTPUT_DECIMAL, - &ConfigFileEntry.throttle_duration, + &ConfigFileEntry.throttle_duration, "Connection throttle duration", }, { @@ -510,7 +511,7 @@ 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", @@ -518,6 +519,18 @@ static struct InfoStruct info_table[] = { &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", OUTPUT_DECIMAL, @@ -572,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, @@ -653,8 +672,8 @@ static struct InfoStruct info_table[] = { ** m_info ** parv[1] = servername */ -static int -m_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +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; @@ -664,13 +683,13 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(source_p, form_str(RPL_LOAD2HI), 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); @@ -678,15 +697,14 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p send_birthdate_online_time(source_p); sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO)); - return 0; } /* ** mo_info ** parv[1] = servername */ -static int -mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +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) { @@ -704,8 +722,6 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char * sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO)); } - - return 0; } /* @@ -740,11 +756,11 @@ 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(&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(&me, source_p), RPL_INFO, get_id(source_p, source_p), rb_ctime(startup_time, tbuf, sizeof(tbuf))); } @@ -763,24 +779,24 @@ 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]", + 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->name, infoptr->intvalue, infoptr->desc); } else { - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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->name, infoptr->strvalue, infoptr->desc); } } @@ -792,14 +808,14 @@ send_conf_options(struct Client *source_p) { switch (info_table[i].output_type) { - /* - * For "char *" references - */ + /* + * For "char *" references + */ case OUTPUT_STRING: { char *option = *((char **) info_table[i].option); - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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, @@ -815,7 +831,7 @@ send_conf_options(struct Client *source_p) { char *option = (char *) info_table[i].option; - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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, @@ -831,7 +847,7 @@ send_conf_options(struct Client *source_p) { int option = *((int *) info_table[i].option); - sendto_one(source_p, ":%s %d %s :%-30s %-5d [%-30s]", + 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, @@ -848,7 +864,7 @@ send_conf_options(struct Client *source_p) { int option = *((int *) info_table[i].option); - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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, @@ -864,7 +880,7 @@ send_conf_options(struct Client *source_p) { int option = *((int *) info_table[i].option); - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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, @@ -878,7 +894,7 @@ send_conf_options(struct Client *source_p) { int option = *((int *) info_table[i].option); - sendto_one(source_p, ":%s %d %s :%-30s %-5s [%-30s]", + 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", @@ -896,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