implement configurable channel modes (closes #31)

[solanum.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index a7560982598120c8a058dab298e4f032b881ac3a..96559c13bba0d2dad6a10a9a1eea5eb0c82f62c4 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -75,7 +75,7 @@ rb_dlink_list service_list;
 /* internally defined functions */
 static void set_default_conf(void);
 static void validate_conf(void);
-static void read_conf(FILE *);
+static void read_conf(void);
 static void clear_out_old_conf(void);
 
 static void expire_prop_bans(void *list);
@@ -86,6 +86,7 @@ FILE *conf_fbfile_in;
 extern char yytext[];
 
 static int verify_access(struct Client *client_p, const char *username);
+static struct ConfItem *find_address_conf_by_client(struct Client *client_p, const char *username);
 static int attach_iline(struct Client *, struct ConfItem *);
 
 void
@@ -317,27 +318,8 @@ static int
 verify_access(struct Client *client_p, const char *username)
 {
        struct ConfItem *aconf;
-       char non_ident[USERLEN + 1];
-
-       if(IsGotId(client_p))
-       {
-               aconf = find_address_conf(client_p->host, client_p->sockhost,
-                                       client_p->username, client_p->username,
-                                       (struct sockaddr *) &client_p->localClient->ip,
-                                       client_p->localClient->ip.ss_family,
-                                       client_p->localClient->auth_user);
-       }
-       else
-       {
-               rb_strlcpy(non_ident, "~", sizeof(non_ident));
-               rb_strlcat(non_ident, username, sizeof(non_ident));
-               aconf = find_address_conf(client_p->host, client_p->sockhost,
-                                       non_ident, client_p->username,
-                                       (struct sockaddr *) &client_p->localClient->ip,
-                                       client_p->localClient->ip.ss_family,
-                                       client_p->localClient->auth_user);
-       }
 
+       aconf = find_address_conf_by_client(client_p, username);
        if(aconf == NULL)
                return NOT_AUTHORISED;
 
@@ -399,6 +381,37 @@ verify_access(struct Client *client_p, const char *username)
 }
 
 
+/*
+ * find_address_conf_by_client
+ */
+static struct ConfItem *
+find_address_conf_by_client(struct Client *client_p, const char *username)
+{
+       struct ConfItem *aconf;
+       char non_ident[USERLEN + 1];
+
+       if(IsGotId(client_p))
+       {
+               aconf = find_address_conf(client_p->host, client_p->sockhost,
+                                       client_p->username, client_p->username,
+                                       (struct sockaddr *) &client_p->localClient->ip,
+                                       client_p->localClient->ip.ss_family,
+                                       client_p->localClient->auth_user);
+       }
+       else
+       {
+               rb_strlcpy(non_ident, "~", sizeof(non_ident));
+               rb_strlcat(non_ident, username, sizeof(non_ident));
+               aconf = find_address_conf(client_p->host, client_p->sockhost,
+                                       non_ident, client_p->username,
+                                       (struct sockaddr *) &client_p->localClient->ip,
+                                       client_p->localClient->ip.ss_family,
+                                       client_p->localClient->auth_user);
+       }
+       return aconf;
+}
+
+
 /*
  * add_ip_limit
  *
@@ -674,7 +687,6 @@ set_default_conf(void)
        /* ServerInfo.name = ServerInfo.name; */
        ServerInfo.description = NULL;
        ServerInfo.network_name = NULL;
-       ServerInfo.network_desc = NULL;
 
        memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
        ServerInfo.specific_ipv4_vhost = 0;
@@ -692,6 +704,7 @@ set_default_conf(void)
        ConfigFileEntry.default_operstring = NULL;
        ConfigFileEntry.default_adminstring = NULL;
        ConfigFileEntry.servicestring = NULL;
+       ConfigFileEntry.sasl_service = NULL;
 
        ConfigFileEntry.default_umodes = UMODE_INVISIBLE;
        ConfigFileEntry.failed_oper_notice = YES;
@@ -736,12 +749,10 @@ set_default_conf(void)
        ConfigFileEntry.fname_klinelog = NULL;
        ConfigFileEntry.fname_operspylog = NULL;
        ConfigFileEntry.fname_ioerrorlog = NULL;
-       ConfigFileEntry.use_egd = NO;
        ConfigFileEntry.hide_spoof_ips = YES;
        ConfigFileEntry.hide_error_messages = 1;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
-       ConfigFileEntry.egdpool_path = NULL;
        ConfigFileEntry.use_whois_actually = YES;
        ConfigFileEntry.burst_away = NO;
        ConfigFileEntry.collision_fnc = YES;
@@ -782,6 +793,8 @@ set_default_conf(void)
        ConfigChannel.channel_target_change = YES;
        ConfigChannel.disable_local_channels = NO;
 
+       ConfigChannel.autochanmodes = MODE_TOPICLIMIT | MODE_NOPRIVMSGS;
+
        ConfigServerHide.flatten_links = 0;
        ConfigServerHide.links_delay = 300;
        ConfigServerHide.hidden = 0;
@@ -808,6 +821,7 @@ set_default_conf(void)
        ServerInfo.default_max_clients = MAXCONNECTIONS;
 
        ConfigFileEntry.nicklen = NICKLEN;
+       ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
 
        if (!alias_dict)
                alias_dict = irc_dictionary_create(strcasecmp);
@@ -820,12 +834,12 @@ set_default_conf(void)
  * read_conf()
  *
  *
- * inputs       - file descriptor pointing to config file to use
+ * inputs       - None
  * output       - None
  * side effects        - Read configuration file.
  */
 static void
-read_conf(FILE * file)
+read_conf(void)
 {
        lineno = 0;
 
@@ -853,9 +867,6 @@ validate_conf(void)
        if(ServerInfo.network_name == NULL)
                ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
 
-       if(ServerInfo.network_desc == NULL)
-               ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
-
        if(ServerInfo.ssld_count < 1)
                ServerInfo.ssld_count = 1;
 
@@ -886,6 +897,9 @@ validate_conf(void)
        if (ConfigFileEntry.servicestring == NULL)
                ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
+       if (ConfigFileEntry.sasl_service == NULL)
+               ConfigFileEntry.sasl_service = rb_strdup("SaslServ");
+
        /* RFC 1459 says 1 message per 2 seconds on average and bursts of
         * 5 messages are acceptable, so allow at least that.
         */
@@ -1057,7 +1071,7 @@ find_prop_ban(unsigned int status, const char *user, const char *host)
 }
 
 void
-deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
+deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr, time_t now)
 {
        int i;
 
@@ -1096,7 +1110,7 @@ deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
                        del_from_resv_hash(aconf->host, aconf);
                        break;
        }
-       if (aconf->lifetime != 0 && rb_current_time() < aconf->lifetime)
+       if (aconf->lifetime != 0 && now < aconf->lifetime)
                aconf->status |= CONF_ILLEGAL;
        else
        {
@@ -1132,7 +1146,7 @@ replace_old_ban(struct ConfItem *aconf)
                        aconf->lifetime = aconf->hold;
                /* Tell deactivate_conf() to destroy it. */
                oldconf->lifetime = rb_current_time();
-               deactivate_conf(oldconf, ptr);
+               deactivate_conf(oldconf, ptr, oldconf->lifetime);
        }
 }
 
@@ -1142,13 +1156,15 @@ expire_prop_bans(void *list)
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
+       time_t now;
 
+       now = rb_current_time();
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
-               if(aconf->lifetime <= rb_current_time() ||
-                               (aconf->hold <= rb_current_time() &&
+               if(aconf->lifetime <= now ||
+                               (aconf->hold <= now &&
                                 !(aconf->status & CONF_ILLEGAL)))
                {
                        /* Alert opers that a TKline expired - Hwy */
@@ -1162,7 +1178,7 @@ expire_prop_bans(void *list)
                                                     aconf->host ? aconf->host : "*");
 
                        /* will destroy or mark illegal */
-                       deactivate_conf(aconf, ptr);
+                       deactivate_conf(aconf, ptr, now);
                }
        }
 }
@@ -1280,7 +1296,7 @@ get_oper_name(struct Client *client_p)
  */
 void
 get_printable_conf(struct ConfItem *aconf, char **name, char **host,
-                  char **pass, char **user, int *port, char **classname)
+                  const char **pass, char **user, int *port, char **classname)
 {
        static char null[] = "<NULL>";
        static char zero[] = "default";
@@ -1399,7 +1415,7 @@ read_conf_files(int cold)
        }
 
        call_hook(h_conf_read_start, NULL);
-       read_conf(conf_fbfile_in);
+       read_conf();
        call_hook(h_conf_read_end, NULL);
 
        fclose(conf_fbfile_in);
@@ -1457,8 +1473,6 @@ clear_out_old_conf(void)
        ServerInfo.description = NULL;
        rb_free(ServerInfo.network_name);
        ServerInfo.network_name = NULL;
-       rb_free(ServerInfo.network_desc);
-       ServerInfo.network_desc = NULL;
 
        ServerInfo.ssld_count = 1;
 
@@ -1487,6 +1501,8 @@ clear_out_old_conf(void)
        ConfigFileEntry.servicestring = NULL;
        rb_free(ConfigFileEntry.kline_reason);
        ConfigFileEntry.kline_reason = NULL;
+       rb_free(ConfigFileEntry.sasl_service);
+       ConfigFileEntry.sasl_service = NULL;
 
        /* clean out log */
        rb_free(ConfigFileEntry.fname_userlog);