Merge remote-tracking branch 'ophion/upstream/dnsbl-rename'

[solanum.git] / modules / m_info.c

diff --git a/modules/m_info.c b/modules/m_info.c
index 202716a658ef9afc0353d8a0d1cb3143ea3399f6..4ffd23b6f77efdf1ce3b548b05f6e3b1414dab89 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -20,15 +20,12 @@
  *  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"
 #include "m_info.h"
 #include "channel.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "hook.h"
@@ -41,16 +38,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 +62,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
@@ -151,6 +151,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.client_flood_message_time,
                "Time to allow per client_flood_message_num outside of burst",
        },
+       {
+               "post_registration_delay",
+               OUTPUT_DECIMAL,
+               &ConfigFileEntry.post_registration_delay,
+               "Time to wait before processing commands from a new client",
+       },
        {
                "connect_timeout",
                OUTPUT_DECIMAL,
@@ -284,18 +290,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.hide_spoof_ips,
                "Hide IPs of spoofed users"
        },
-       {
-               "hub",
-               OUTPUT_BOOLEAN_YN,
-               &ServerInfo.hub,
-               "Server is a hub"
-       },
-       {
-               "kline_delay",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.kline_delay,
-               "Duration of time to delay kline checking"
-       },
        {
                "kline_reason",
                OUTPUT_STRING,
@@ -530,6 +524,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.away_interval,
                "The minimum time between aways",
        },
+       {
+               "tls_ciphers_oper_only",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigFileEntry.tls_ciphers_oper_only,
+               "TLS cipher strings are hidden in whois for non-opers",
+       },
        {
                "default_split_server_count",
                OUTPUT_DECIMAL,
@@ -638,6 +638,12 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.resv_forcepart,
                "Force-part local users on channel RESV"
        },
+       {
+               "opmod_send_statusmsg",
+               OUTPUT_BOOLEAN_YN,
+               &ConfigChannel.opmod_send_statusmsg,
+               "Send messages to @#channel if affected by +z"
+       },
        {
                "disable_hidden",
                OUTPUT_BOOLEAN_YN,
@@ -671,8 +677,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;
 
@@ -682,13 +688,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);
 
@@ -696,15 +702,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)
        {
@@ -722,8 +727,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;
 }
 
 /*
@@ -781,7 +784,7 @@ 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++)
        {