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 0f54d542dd4f3cdcce9ef5f719c924424fe6d0bf..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;
@@ -781,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;
@@ -807,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);
@@ -819,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;
 
@@ -852,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;
 
@@ -1284,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";
@@ -1403,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);
@@ -1461,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;