Cleanups to 005 code, from ratbox (androsyn).

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 5cdccf381eae92c0778e0787cb2516d45ed9cdc3..1d6abd031183685b3015a3544b6673a96ed00862 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.c 3251 2007-03-05 18:58:38Z nenolod $
+ *  $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -173,8 +173,6 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 {
        int i;
 
-       ClearAccess(source_p);
-
        if((i = verify_access(source_p, username)))
        {
                ilog(L_FUSER, "Access denied: %s[%s]", 
@@ -239,7 +237,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                                "I-line is full for %s!%s%s@%s (%s).",
                                source_p->name, IsGotId(source_p) ? "" : "~",
                                source_p->username, source_p->host,
-                               source_p->sockhost);
+                               show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255");
 
                ilog(L_FUSER, "Too many connections from %s!%s%s@%s.", 
                        source_p->name, IsGotId(source_p) ? "" : "~",
@@ -281,13 +279,12 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                                source_p->name, IsGotId(source_p) ? "" : "~",
                                source_p->username, source_p->sockhost,
                                source_p->localClient->listener->name, port);
-                       add_reject(client_p);
+                       add_reject(client_p, NULL, NULL);
                        exit_client(client_p, source_p, &me,
                                    "You are not authorised to use this server");
                        break;
                }
        case BANNED_CLIENT:
-               add_reject(client_p);
                exit_client(client_p, client_p, &me, "*** Banned ");
                ServerStats->is_ref++;
                break;
@@ -337,16 +334,11 @@ verify_access(struct Client *client_p, const char *username)
        {
                if(aconf->flags & CONF_FLAGS_REDIR)
                {
-                       sendto_one(client_p, form_str(RPL_REDIR),
-                                       me.name, client_p->name,
+                       sendto_one_numeric(client_p, RPL_REDIR, form_str(RPL_REDIR),
                                        aconf->name ? aconf->name : "", aconf->port);
                        return (NOT_AUTHORISED);
                }
 
-
-               if(IsConfDoIdentd(aconf))
-                       SetNeedId(client_p);
-
                /* Thanks for spoof idea amm */
                if(IsConfDoSpoofIp(aconf))
                {
@@ -389,6 +381,7 @@ verify_access(struct Client *client_p, const char *username)
                                        form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, client_p->name, aconf->passwd);
                }
+               add_reject(client_p, aconf->user, aconf->host);
                return (BANNED_CLIENT);
        }
        else if(aconf->status & CONF_GLINE)
@@ -400,6 +393,7 @@ verify_access(struct Client *client_p, const char *username)
                                        form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, client_p->name, aconf->passwd);
 
+               add_reject(client_p, aconf->user, aconf->host);
                return (BANNED_CLIENT);
        }
 
@@ -605,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
                else
                {
                        sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
-                       SetExemptLimits(client_p);
                }
 
        }
@@ -738,7 +731,6 @@ set_default_conf(void)
        memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
        ServerInfo.specific_ipv6_vhost = 0;
 #endif
-       ServerInfo.use_ts6 = YES;
 
        /* Don't reset hub, as that will break lazylinks */
        /* ServerInfo.hub = NO; */
@@ -800,7 +792,6 @@ set_default_conf(void)
        ConfigFileEntry.gline_min_cidr6 = 48;
        ConfigFileEntry.hide_spoof_ips = YES;
        ConfigFileEntry.hide_error_messages = 1;
-       ConfigFileEntry.idletime = 0;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
        DupString(ConfigFileEntry.servlink_path, SLPATH);
@@ -830,7 +821,6 @@ set_default_conf(void)
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
        ConfigChannel.burst_topicwho = NO;
-       ConfigChannel.invite_ops_only = YES;
        ConfigChannel.kick_on_split_riding = NO;
 
        ConfigChannel.default_split_user_count = 15000;
@@ -852,8 +842,9 @@ set_default_conf(void)
         ConfigFileEntry.reject_after_count = 5;
        ConfigFileEntry.reject_ban_time = 300;  
        ConfigFileEntry.reject_duration = 120;
+       ConfigFileEntry.max_unknown_ip = 2;
 
-       ServerInfo.max_clients = MAXCONNECTIONS;
+       ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES
@@ -901,8 +892,6 @@ validate_conf(void)
           (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
                ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
 
-       GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60);
-
        if(!split_users || !split_servers ||
           (!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
        {
@@ -1201,6 +1190,19 @@ read_conf_files(int cold)
        fclose(conf_fbfile_in);
 }
 
+/*
+ * free an alias{} entry.
+ */
+static void
+free_alias_cb(struct DictionaryElement *ptr, void *unused)
+{
+       struct alias_entry *aptr = ptr->data;
+
+       MyFree(aptr->name);
+       MyFree(aptr->target);
+       MyFree(aptr);
+}
+
 /*
  * clear_out_old_conf
  *
@@ -1214,7 +1216,6 @@ clear_out_old_conf(void)
        struct Class *cltmp;
        dlink_node *ptr;
        dlink_node *next_ptr;
-       int i;
 
        /*
         * don't delete the class table, rather mark all entries
@@ -1271,19 +1272,8 @@ clear_out_old_conf(void)
        }
 
        /* remove any aliases... -- nenolod */
-       for (i = 0; i < MAX_MSG_HASH; i++)
-       {
-               DLINK_FOREACH_SAFE(ptr, next_ptr, alias_hash_table[i].head)
-               {
-                       struct alias_entry *aptr = ptr->data;
-
-                       MyFree(aptr->name);
-                       MyFree(aptr->target);
-                       MyFree(aptr);
-
-                       dlinkDestroy(ptr, &alias_hash_table[i]);
-               }
-       }
+       irc_dictionary_destroy(alias_dict, free_alias_cb, NULL);
+       alias_dict = NULL;
 
        destroy_blacklists();