[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC vs.
Revision 4545 by michael, Fri Aug 22 08:46:13 2014 UTC

+#include "list.h"
+#include "ircd_defs.h"
+#include "conf.h"
-+
+#include "conf_pseudo.h"
+#include "server.h"
+#include "resv.h"
+#include "channel.h"
+ * if successful save hp in the conf item it was called with
+ */
+static void
-<
+conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
->
+conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
+  struct MaskItem *conf = vptr;
+  if (!conf->dns_pending)
+    conf->dns_pending = 1;
-<
+    gethost_byname(conf_dns_callback, conf, conf->host);
->
->
+    if (conf->aftype == AF_INET)
->
+      gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
->
+    else
->
+      gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
+  dlink_node *ptr = NULL, *ptr_next = NULL;
+  dlink_list *list = NULL;
-<
+  if (conf->node.next)
-<
+    if ((list = map_to_list(conf->type)))
-<
+      dlinkDelete(&conf->node, list);
->
+  if ((list = map_to_list(conf->type)))
->
+    dlinkFindDelete(list, conf);
+  MyFree(conf->name);
+    conf = find_address_conf(client_p->host, client_p->username,
+                             &client_p->localClient->ip,
+                             client_p->localClient->aftype,
-<
+                             client_p->localClient->passwd);
->
+                             client_p->localClient->password);
+  else
+    conf = find_address_conf(client_p->host,non_ident,
+                             &client_p->localClient->ip,
+                             client_p->localClient->aftype,
-<
+                             client_p->localClient->passwd);
->
+                             client_p->localClient->password);
+  if (conf)
+  ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
+  ip_found->count++;
-<
+  SetIpHash(client_p);
->
+  AddFlag(client_p, FLAGS_IPHASH);
+  count_user_host(client_p->username, client_p->host,
+                  &global, &local, &ident);
+                  if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
+                    return conf;
+              break;
-–
+#ifdef IPV6
+            case HM_IPV6:
+              if (who->localClient->aftype == AF_INET6)
+                if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
+                  if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
+                    return conf;
+              break;
-–
+#endif
+            default:
+              assert(0);
+  /* don't close listeners until we know we can go ahead with the rehash */
-–
+  /* Check to see if we magically got(or lost) IPv6 support */
-–
+  check_can_use_v6();
-–
+  read_conf_files(0);
-–
+  if (ConfigServerInfo.description)
-–
+    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
-–
+  load_conf_modules();
+  check_conf_klines();
+  assert(class_default == class_get_list()->tail->data);
+#ifdef HAVE_LIBCRYPTO
-+
+#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
-+
+  {
-+
+    EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-+
-+
+    if (key)
-+
+    {
-+
+      SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
-+
+      EC_KEY_free(key);
-+
+    }
-+
+  }
-+
-+
+  SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
-+
+#endif
-+
+  ConfigServerInfo.message_digest_algorithm = EVP_sha256();
+  ConfigServerInfo.rsa_private_key = NULL;
+  ConfigServerInfo.rsa_private_key_file = NULL;
+  ConfigGeneral.away_count = 2;
+  ConfigGeneral.away_time = 10;
-–
+  ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
+  ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
+  ConfigGeneral.cycle_on_host_change = 1;
+  ConfigGeneral.glines = 0;
+  if (ConfigServerInfo.network_desc == NULL)
+    ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
-–
+  if (ConfigGeneral.service_name == NULL)
-–
+    ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
-–
+  ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
+ *                This is an event started off in ircd.c
+ */
+void
-<
+cleanup_tklines(void *notused)
->
+cleanup_tklines(void *unused)
+  hostmask_expire_temporary();
+  expire_tklines(&xconf_items);
+clear_out_old_conf(void)
+  dlink_node *ptr = NULL, *next_ptr = NULL;
-–
+  struct MaskItem *conf;
+  dlink_list *free_items [] = {
+    &server_items,   &oconf_items,
+     &uconf_items,   &xconf_items,
+    DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
-<
+      conf = ptr->data;
->
+      struct MaskItem *conf = ptr->data;
-<
+      dlinkDelete(&conf->node, map_to_list(conf->type));
->
+      conf->active = 0;
->
+      dlinkDelete(&conf->node, *iterator);
+      /* XXX This is less than pretty */
+      if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
+  /* clean out module paths */
+  mod_clear_paths();
-+
+  pseudo_clear();
-+
+  /* clean out ConfigServerInfo */
+  MyFree(ConfigServerInfo.description);
+  ConfigServerInfo.description = NULL;
+  /* clean out listeners */
+  close_listeners();
-–
-–
+  /* clean out general */
-–
+  MyFree(ConfigGeneral.service_name);
-–
+  ConfigGeneral.service_name = NULL;
+/* conf_add_class_to_conf()

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing ircd-hybrid/trunk/src/conf.c (file contents): Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC vs. Revision 4545 by michael, Fri Aug 22 08:46:13 2014 UTC

Diff Legend

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC vs.
Revision 4545 by michael, Fri Aug 22 08:46:13 2014 UTC