]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/s_conf.c
autochanmodes support
[irc/rqf/shadowircd.git] / src / s_conf.c
index 13751b51b5f3f34a08ec77f908022906839ec329..40a18b051bea63fae4bfb10ee62f6f48a351bac6 100644 (file)
@@ -49,6 +49,7 @@
 #include "blacklist.h"
 #include "privilege.h"
 #include "sslproc.h"
+#include "bandbi.h"
 
 struct config_server_hide ConfigServerHide;
 
@@ -76,7 +77,6 @@ static void reorganise_temp_kd(void *list);
 
 FILE *conf_fbfile_in;
 extern char yytext[];
-struct Client *remote_rehash_oper_p;
 
 static int verify_access(struct Client *client_p, const char *username);
 static int attach_iline(struct Client *, struct ConfItem *);
@@ -635,67 +635,10 @@ rehash(int sig)
        return (0);
 }
 
-static struct banconf_entry
-{
-       const char **filename;
-       void (*func) (FILE *);
-       int perm;
-} banconfs[] = {
-       { &ConfigFileEntry.klinefile,   parse_k_file,   0 },
-       { &ConfigFileEntry.klinefile,   parse_k_file,   1 },
-       { &ConfigFileEntry.dlinefile,   parse_d_file,   0 },
-       { &ConfigFileEntry.dlinefile,   parse_d_file,   1 },
-       { &ConfigFileEntry.xlinefile,   parse_x_file,   0 },
-       { &ConfigFileEntry.xlinefile,   parse_x_file,   1 },
-       { &ConfigFileEntry.resvfile,    parse_resv_file,0 },
-       { &ConfigFileEntry.resvfile,    parse_resv_file,1 },
-       { NULL,                         NULL,           0 }
-};
-
 void
 rehash_bans(int sig)
 {
-       FILE *file;
-       char buf[MAXPATHLEN];
-       int i;
-
-       if(sig != 0)
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                               "Got signal SIGUSR2, reloading ban confs");
-
-       clear_out_address_conf_bans();
-       clear_s_newconf_bans();
-
-       for(i = 0; banconfs[i].filename; i++)
-       {
-               if(banconfs[i].perm)
-                       snprintf(buf, sizeof(buf), "%s.perm", *banconfs[i].filename);
-               else
-                       snprintf(buf, sizeof(buf), "%s", *banconfs[i].filename);
-
-               if((file = fopen(buf, "r")) == NULL)
-               {
-                       if(banconfs[i].perm)
-                               continue;
-
-                       ilog(L_MAIN, "Failed reading ban file %s",
-                               *banconfs[i].filename);
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "Can't open %s file bans could be missing!",
-                                       *banconfs[i].filename);
-                       if (remote_rehash_oper_p)
-                               sendto_one_notice(remote_rehash_oper_p,
-                                       ":*** Notice -- Can't open %s file bans could be missing!",
-                                       *banconfs[i].filename);
-               }
-               else
-               {
-                       (banconfs[i].func)(file);
-                       fclose(file);
-               }
-       }
-
-       check_banned_lines();
+       bandb_rehash_bans();
 }
 
 /*
@@ -792,6 +735,7 @@ set_default_conf(void)
        ConfigFileEntry.collision_fnc = YES;
        ConfigFileEntry.global_snotices = YES;
        ConfigFileEntry.operspy_dont_care_user_info = NO;
+       ConfigFileEntry.secret_channels_in_whois = NO;
 
 #ifdef HAVE_LIBZ
        ConfigFileEntry.compression_level = 4;
@@ -802,6 +746,7 @@ set_default_conf(void)
        ConfigFileEntry.oper_only_umodes = UMODE_SERVNOTICE;
        ConfigFileEntry.oper_snomask = SNO_GENERAL;
 
+       ConfigChannel.autochanmodes = rb_strdup("nt");
        ConfigChannel.use_except = YES;
        ConfigChannel.use_invex = YES;
        ConfigChannel.use_knock = YES;
@@ -811,6 +756,9 @@ set_default_conf(void)
        ConfigChannel.max_chans_per_user = 15;
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
+       ConfigChannel.only_ascii_channels = NO;
+       ConfigChannel.cycle_host_change = YES;
+       ConfigChannel.host_in_topic = YES;
        ConfigChannel.burst_topicwho = NO;
        ConfigChannel.kick_on_split_riding = NO;
 
@@ -818,6 +766,7 @@ set_default_conf(void)
        ConfigChannel.default_split_server_count = 10;
        ConfigChannel.no_join_on_split = NO;
        ConfigChannel.no_create_on_split = YES;
+       ConfigChannel.resv_forcepart = YES;
 
        ConfigServerHide.flatten_links = 0;
        ConfigServerHide.links_delay = 300;
@@ -835,8 +784,12 @@ set_default_conf(void)
        ConfigFileEntry.reject_duration = 120;
        ConfigFileEntry.throttle_count = 4;
        ConfigFileEntry.throttle_duration = 60;
+       ConfigFileEntry.expire_override_time = 300;
 
        ServerInfo.default_max_clients = MAXCONNECTIONS;
+
+       if (!alias_dict)
+               alias_dict = irc_dictionary_create(strcasecmp);
 }
 
 #undef YES
@@ -1138,7 +1091,7 @@ read_conf_files(int cold)
 
        conf_fbfile_in = NULL;
 
-       filename = get_conf_name(CONF_TYPE);
+       filename = ConfigFileEntry.configfile;
 
        /* We need to know the initial filename for the yyerror() to report
           FIXME: The full path is in conffilenamebuf first time since we
@@ -1159,9 +1112,6 @@ read_conf_files(int cold)
                {
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                             "Can't open file '%s' - aborting rehash!", filename);
-                       if (remote_rehash_oper_p)
-                               sendto_one_notice(remote_rehash_oper_p,
-                                            ":*** Notice -- Can't open file '%s' - aborting rehash!", filename);
                        return;
                }
        }
@@ -1259,8 +1209,11 @@ clear_out_old_conf(void)
        }
 
        /* remove any aliases... -- nenolod */
-       irc_dictionary_destroy(alias_dict, free_alias_cb, NULL);
-       alias_dict = NULL;
+       if (alias_dict != NULL)
+       {
+               irc_dictionary_destroy(alias_dict, free_alias_cb, NULL);
+               alias_dict = NULL;
+       }
 
        destroy_blacklists();
 
@@ -1270,162 +1223,6 @@ clear_out_old_conf(void)
 }
 
 
-/* write_confitem()
- *
- * inputs       - kline, dline or resv type flag
- *              - client pointer to report to
- *              - user name of target
- *              - host name of target
- *              - reason for target
- *              - time string
- *              - type of xline
- * output       - NONE
- * side effects - This function takes care of finding the right conf
- *                file and adding the line to it, as well as notifying
- *                opers and the user.
- */
-void
-write_confitem(KlineType type, struct Client *source_p, char *user,
-              char *host, const char *reason, const char *oper_reason,
-              const char *current_date, int xtype)
-{
-       char buffer[1024];
-       FILE *out;
-       const char *filename;   /* filename to use for kline */
-
-       filename = get_conf_name(type);
-
-       if(type == KLINE_TYPE)
-       {
-               if(EmptyString(oper_reason))
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "%s added K-Line for [%s@%s] [%s]",
-                                       get_oper_name(source_p), user, 
-                                       host, reason);
-                       ilog(L_KLINE, "K %s 0 %s %s %s",
-                               get_oper_name(source_p), user, host, reason);
-               }
-               else
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "%s added K-Line for [%s@%s] [%s|%s]",
-                                       get_oper_name(source_p), user,
-                                       host, reason, oper_reason);
-                       ilog(L_KLINE, "K %s 0 %s %s %s|%s",
-                               get_oper_name(source_p), user, host,
-                               reason, oper_reason);
-               }
-
-               sendto_one_notice(source_p, ":Added K-Line [%s@%s]",
-                                 user, host);
-       }
-       else if(type == DLINE_TYPE)
-       {
-               if(EmptyString(oper_reason))
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "%s added D-Line for [%s] [%s]",
-                                       get_oper_name(source_p), host, reason);
-                       ilog(L_KLINE, "D %s 0 %s %s",
-                               get_oper_name(source_p), host, reason);
-               }
-               else
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "%s added D-Line for [%s] [%s|%s]",
-                                       get_oper_name(source_p), host, 
-                                       reason, oper_reason);
-                       ilog(L_KLINE, "D %s 0 %s %s|%s",
-                               get_oper_name(source_p), host, 
-                               reason, oper_reason);
-               }
-
-               sendto_one_notice(source_p, ":Added D-Line [%s] to %s", host, filename);
-
-       }
-       else if(type == RESV_TYPE)
-       {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                               "%s added RESV for [%s] [%s]",
-                               get_oper_name(source_p), host, reason);
-               ilog(L_KLINE, "R %s 0 %s %s",
-                       get_oper_name(source_p), host, reason);
-
-               sendto_one_notice(source_p, ":Added RESV for [%s] [%s]",
-                                 host, reason);
-       }
-
-       if((out = fopen(filename, "a")) == NULL)
-       {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem opening %s ", filename);
-               sendto_one_notice(source_p, ":*** Problem opening file, added temporarily only");
-               return;
-       }
-
-       if(oper_reason == NULL)
-               oper_reason = "";
-
-       if(type == KLINE_TYPE)
-       {
-               rb_snprintf(buffer, sizeof(buffer),
-                          "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
-                          user, host, reason, oper_reason, current_date,
-                          get_oper_name(source_p), (long int)rb_current_time());
-       }
-       else if(type == DLINE_TYPE)
-       {
-               rb_snprintf(buffer, sizeof(buffer),
-                          "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
-                          reason, oper_reason, current_date, get_oper_name(source_p), (long int)rb_current_time());
-       }
-       else if(type == RESV_TYPE)
-       {
-               rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
-                          host, reason, get_oper_name(source_p), (long int)rb_current_time());
-       }
-
-       if(fputs(buffer, out) == -1)
-       {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename);
-               sendto_one_notice(source_p, ":*** Problem writing to file, added temporarily only");
-               fclose(out);
-               return;
-       }
-
-       if (fclose(out))
-       {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename);
-               sendto_one_notice(source_p, ":*** Problem writing to file, added temporarily only");
-               return;
-       }
-}
-
-/* get_conf_name
- *
- * inputs       - type of conf file to return name of file for
- * output       - pointer to filename for type of conf
- * side effects - none
- */
-const char *
-get_conf_name(KlineType type)
-{
-       if(type == CONF_TYPE)
-       {
-               return (ConfigFileEntry.configfile);
-       }
-       else if(type == DLINE_TYPE)
-       {
-               return (ConfigFileEntry.dlinefile);
-       }
-       else if(type == RESV_TYPE)
-       {
-               return (ConfigFileEntry.resvfile);
-       }
-
-       return ConfigFileEntry.klinefile;
-}
-
 /*
  * conf_add_class_to_conf
  * inputs       - pointer to config item
@@ -1530,13 +1327,10 @@ yyerror(const char *msg)
 
        strip_tabs(newlinebuf, linebuf, strlen(linebuf));
 
+       ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",
                             conffilebuf, lineno + 1, msg, newlinebuf);
-       if (remote_rehash_oper_p)
-               sendto_one_notice(remote_rehash_oper_p, ":*** Notice -- \"%s\", line %d: %s at '%s'",
-                                    conffilebuf, lineno + 1, msg, newlinebuf);
 
-       ilog(L_MAIN, "\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
 }
 
 int