Resolve shfit/reduce conflict in timespec production (#54)

[solanum.git] / ircd / s_newconf.c

diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index d5e5a9d29fbb153bb085a55bdf4d995a67535529..e429507de1e56851c63c50ec0c7bb4c2ec91988f 100644 (file)
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -32,7 +32,6 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "common.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "client.h"
@@ -47,7 +46,6 @@
 #include "logger.h"
 #include "dns.h"
 
-rb_dlink_list shared_conf_list;
 rb_dlink_list cluster_conf_list;
 rb_dlink_list oper_conf_list;
 rb_dlink_list hubleaf_conf_list;
@@ -83,13 +81,6 @@ clear_s_newconf(void)
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
 
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, shared_conf_list.head)
-       {
-               /* ptr here is ptr->data->node */
-               rb_dlinkDelete(ptr, &shared_conf_list);
-               free_remote_conf(ptr->data);
-       }
-
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cluster_conf_list.head)
        {
                rb_dlinkDelete(ptr, &cluster_conf_list);
@@ -174,31 +165,6 @@ free_remote_conf(struct remote_conf *remote_p)
        rb_free(remote_p);
 }
 
-int
-find_shared_conf(const char *username, const char *host,
-               const char *server, int flags)
-{
-       struct remote_conf *shared_p;
-       rb_dlink_node *ptr;
-
-       RB_DLINK_FOREACH(ptr, shared_conf_list.head)
-       {
-               shared_p = ptr->data;
-
-               if(match(shared_p->username, username) &&
-                  match(shared_p->host, host) &&
-                  match(shared_p->server, server))
-               {
-                       if(shared_p->flags & flags)
-                               return YES;
-                       else
-                               return NO;
-               }
-       }
-
-       return NO;
-}
-
 void
 propagate_generic(struct Client *source_p, const char *command,
                const char *target, int cap, const char *format, ...)
@@ -305,7 +271,7 @@ find_oper_conf(const char *username, const char *host, const char *locip, const
 
                if(parse_netmask(addr, &ip, &bits) != HM_HOST)
                {
-                       if(ip.ss_family == cip.ss_family &&
+                       if(GET_SS_FAMILY(&ip) == GET_SS_FAMILY(&cip) &&
                           comp_with_mask_sock((struct sockaddr *)&ip, (struct sockaddr *)&cip, bits))
                                return oper_p;
                }
@@ -325,7 +291,21 @@ struct server_conf *
 make_server_conf(void)
 {
        struct server_conf *server_p = rb_malloc(sizeof(struct server_conf));
-       server_p->aftype = AF_INET;
+
+       SET_SS_FAMILY(&server_p->connect4, AF_UNSPEC);
+       SET_SS_LEN(&server_p->connect4, sizeof(struct sockaddr_in));
+
+       SET_SS_FAMILY(&server_p->bind4, AF_UNSPEC);
+       SET_SS_LEN(&server_p->bind4, sizeof(struct sockaddr_in));
+
+       SET_SS_FAMILY(&server_p->connect6, AF_UNSPEC);
+       SET_SS_LEN(&server_p->connect6, sizeof(struct sockaddr_in6));
+
+       SET_SS_FAMILY(&server_p->bind6, AF_UNSPEC);
+       SET_SS_LEN(&server_p->bind6, sizeof(struct sockaddr_in6));
+
+       server_p->aftype = AF_UNSPEC;
+
        return server_p;
 }
 
@@ -349,13 +329,15 @@ free_server_conf(struct server_conf *server_p)
        }
 
        rb_free(server_p->name);
-       rb_free(server_p->host);
+       rb_free(server_p->connect_host);
+       rb_free(server_p->bind_host);
        rb_free(server_p->class_name);
+       rb_free(server_p->certfp);
        rb_free(server_p);
 }
 
 /*
- * conf_dns_callback
+ * conf_connect_dns_callback
  * inputs       - pointer to struct ConfItem
  *              - pointer to adns reply
  * output       - none
@@ -365,14 +347,55 @@ free_server_conf(struct server_conf *server_p)
  * if successful save hp in the conf item it was called with
  */
 static void
-conf_dns_callback(const char *result, int status, int aftype, void *data)
+conf_connect_dns_callback(const char *result, int status, int aftype, void *data)
 {
        struct server_conf *server_p = data;
 
-       if(status == 1)
-               rb_inet_pton_sock(result, (struct sockaddr *)&server_p->my_ipnum);
+       if(aftype == AF_INET)
+       {
+               if(status == 1)
+                       rb_inet_pton_sock(result, &server_p->connect4);
+
+               server_p->dns_query_connect4 = 0;
+       }
+       else if(aftype == AF_INET6)
+       {
+               if(status == 1)
+                       rb_inet_pton_sock(result, &server_p->connect6);
 
-       server_p->dns_query = 0;
+               server_p->dns_query_connect6 = 0;
+       }
+}
+
+/*
+ * conf_bind_dns_callback
+ * inputs       - pointer to struct ConfItem
+ *              - pointer to adns reply
+ * output       - none
+ * side effects - called when resolver query finishes
+ * if the query resulted in a successful search, hp will contain
+ * a non-null pointer, otherwise hp will be null.
+ * if successful save hp in the conf item it was called with
+ */
+static void
+conf_bind_dns_callback(const char *result, int status, int aftype, void *data)
+{
+       struct server_conf *server_p = data;
+
+       if(aftype == AF_INET)
+       {
+               if(status == 1)
+                       rb_inet_pton_sock(result, &server_p->bind4);
+
+               server_p->dns_query_bind4 = 0;
+       }
+       else if(aftype == AF_INET6)
+       {
+               if(status == 1)
+                       rb_inet_pton_sock(result, &server_p->bind6);
+
+               server_p->dns_query_bind6 = 0;
+       }
 }
 
 void
@@ -396,11 +419,21 @@ add_server_conf(struct server_conf *server_p)
                server_p->class_name = rb_strdup("default");
        }
 
-       if(strpbrk(server_p->host, "*?"))
-               return;
+       if(server_p->connect_host && !strpbrk(server_p->connect_host, "*?"))
+       {
+               server_p->dns_query_connect4 =
+                       lookup_hostname(server_p->connect_host, AF_INET, conf_connect_dns_callback, server_p);
+               server_p->dns_query_connect6 =
+                       lookup_hostname(server_p->connect_host, AF_INET6, conf_connect_dns_callback, server_p);
+       }
 
-       server_p->dns_query =
-               lookup_hostname(server_p->host, GET_SS_FAMILY(&server_p->my_ipnum), conf_dns_callback, server_p);
+       if(server_p->bind_host)
+       {
+               server_p->dns_query_bind4 =
+                       lookup_hostname(server_p->bind_host, AF_INET, conf_bind_dns_callback, server_p);
+               server_p->dns_query_bind6 =
+                       lookup_hostname(server_p->bind_host, AF_INET6, conf_bind_dns_callback, server_p);
+       }
 }
 
 struct server_conf *
@@ -685,8 +718,7 @@ expire_temp_rxlines(void *unused)
        struct ConfItem *aconf;
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
-       int i;
-       struct rb_radixtree_iteration_state state;
+       rb_radixtree_iteration_state state;
 
        RB_RADIXTREE_FOREACH(aconf, &state, resv_tree)
        {