extern int check_config;
typedef struct indexed_modcallable {
- const char *server;
int comp;
int idx;
modcallable *modulelist;
} indexed_modcallable;
+typedef struct virtual_server_t {
+ const char *name;
+ time_t created;
+ int can_free;
+ CONF_SECTION *cs;
+ rbtree_t *components;
+ modcallable *mc[RLM_COMPONENT_COUNT];
+ CONF_SECTION *subcs[RLM_COMPONENT_COUNT];
+ struct virtual_server_t *next;
+} virtual_server_t;
+
/*
- * For each component, keep an ordered list of ones to call.
+ * Keep a hash of virtual servers, so that we can reload them.
*/
-static rbtree_t *components = NULL;
+#define VIRTUAL_SERVER_HASH_SIZE (256)
+static virtual_server_t *virtual_servers[VIRTUAL_SERVER_HASH_SIZE];
static rbtree_t *module_tree = NULL;
static rbtree_t *instance_tree = NULL;
+struct fr_module_hup_t {
+ module_instance_t *mi;
+ time_t when;
+ void *insthandle;
+ fr_module_hup_t *next;
+};
+
+
typedef struct section_type_value_t {
const char *section;
const char *typename;
int attr;
} section_type_value_t;
-
/*
* Ordered by component
*/
{ "session", "Session-Type", PW_SESSION_TYPE },
{ "pre-proxy", "Pre-Proxy-Type", PW_PRE_PROXY_TYPE },
{ "post-proxy", "Post-Proxy-Type", PW_POST_PROXY_TYPE },
- { "post-auth", "Post-Auth-Type", PW_POST_AUTH_TYPE },
+ { "post-auth", "Post-Auth-Type", PW_POST_AUTH_TYPE }
+#ifdef WITH_COA
+ ,
+ { "recv-coa", "Recv-CoA-Type", PW_RECV_COA_TYPE },
+ { "send-coa", "Send-CoA-Type", PW_SEND_COA_TYPE }
+#endif
};
+
+#ifdef WITHOUT_LIBLTDL
+#ifdef WITH_DLOPEN
+#include <dlfcn.h>
+
+#ifndef RTLD_NOW
+#define RTLD_NOW (0)
+#endif
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL (0)
+#endif
+
+#define fr_dlopenext lt_dlopenext
+#ifndef LT_SHREXT
+#ifdef __APPLE__
+#define LT_SHREXT ".so"
+#elif defined (WIN32)
+#define LT_SHREXT ".dll"
+#else
+#define LT_SHREXT ".dylib"
+#endif
+#endif
+
+lt_dlhandle lt_dlopenext(const char *name)
+{
+ char buffer[256];
+
+ strlcpy(buffer, name, sizeof(buffer));
+
+ /*
+ * FIXME: Make this configurable...
+ */
+ strlcat(buffer, LT_SHREXT, sizeof(buffer));
+
+ return dlopen(buffer, RTLD_NOW | RTLD_LOCAL);
+}
+
+void *lt_dlsym(lt_dlhandle handle, UNUSED const char *symbol)
+{
+ return dlsym(handle, symbol);
+}
+
+int lt_dlclose(lt_dlhandle handle)
+{
+ if (!handle) return 0;
+
+ return dlclose(handle);
+}
+
+const char *lt_dlerror(void)
+{
+ return dlerror();
+}
+
+
+#else /* without dlopen */
+typedef struct lt_dlmodule_t {
+ const char *name;
+ void *ref;
+} lt_dlmodule_t;
+
+typedef struct eap_type_t EAP_TYPE;
+typedef struct rlm_sql_module_t rlm_sql_module_t;
+
+/*
+ * FIXME: Write hackery to auto-generate this data.
+ * We only need to do this on systems that don't have dlopen.
+ */
+extern module_t rlm_pap;
+extern module_t rlm_chap;
+extern module_t rlm_eap;
+extern module_t rlm_sql;
+/* and so on ... */
+
+extern EAP_TYPE rlm_eap_md5;
+extern rlm_sql_module_t rlm_sql_mysql;
+/* and so on ... */
+
+static const lt_dlmodule_t lt_dlmodules[] = {
+ { "rlm_pap", &rlm_pap },
+ { "rlm_chap", &rlm_chap },
+ { "rlm_eap", &rlm_eap },
+ /* and so on ... */
+
+ { "rlm_eap_md5", &rlm_eap_md5 },
+ /* and so on ... */
+
+ { "rlm_sql_mysql", &rlm_sql_mysql },
+ /* and so on ... */
+
+ { NULL, NULL }
+};
+
+#define fr_dlopenext lt_dlopenext
+lt_dlhandle lt_dlopenext(const char *name)
+{
+ int i;
+
+ for (i = 0; lt_dlmodules[i].name != NULL; i++) {
+ if (strcmp(name, lt_dlmodules[i].name) == 0) {
+ return lt_dlmodules[i].ref;
+ }
+ }
+
+ return NULL;
+}
+
+void *lt_dlsym(lt_dlhandle handle, UNUSED const char *symbol)
+{
+ return handle;
+}
+
+int lt_dlclose(lt_dlhandle handle)
+{
+ return 0;
+}
+
+const char *lt_dlerror(void)
+{
+ return "Unspecified error";
+}
+
+#endif /* WITH_DLOPEN */
+#else /* WITHOUT_LIBLTDL */
+
+/*
+ * Solve the issues of libraries linking to other libraries
+ * by using a newer libltdl API.
+ */
+#ifndef HAVE_LT_DLADVISE_INIT
+#define fr_dlopenext lt_dlopenext
+#else
+static lt_dlhandle fr_dlopenext(const char *filename)
+{
+ lt_dlhandle handle = 0;
+ lt_dladvise advise;
+
+ if (!lt_dladvise_init (&advise) &&
+ !lt_dladvise_ext (&advise) &&
+ !lt_dladvise_global (&advise)) {
+ handle = lt_dlopenadvise (filename, advise);
+ }
+
+ lt_dladvise_destroy (&advise);
+
+ return handle;
+}
+#endif /* HAVE_LT_DLADVISE_INIT */
+#endif /* WITHOUT_LIBLTDL */
+
+static int virtual_server_idx(const char *name)
+{
+ uint32_t hash;
+
+ if (!name) return 0;
+
+ hash = fr_hash_string(name);
+
+ return hash & (VIRTUAL_SERVER_HASH_SIZE - 1);
+}
+
+static void virtual_server_free(virtual_server_t *server)
+{
+ if (!server) return;
+
+ if (server->components) rbtree_free(server->components);
+ server->components = NULL;
+
+ free(server);
+}
+
+void virtual_servers_free(time_t when)
+{
+ int i;
+ virtual_server_t **last;
+
+ for (i = 0; i < VIRTUAL_SERVER_HASH_SIZE; i++) {
+ virtual_server_t *server, *next;
+
+ last = &virtual_servers[i];
+ for (server = virtual_servers[i];
+ server != NULL;
+ server = next) {
+ next = server->next;
+
+ /*
+ * If we delete it, fix the links so that
+ * we don't orphan anything. Also,
+ * delete it if it's old, AND a newer one
+ * was defined.
+ *
+ * Otherwise, the last pointer gets set to
+ * the one we didn't delete.
+ */
+ if ((when == 0) ||
+ ((server->created < when) && server->can_free)) {
+ *last = server->next;
+ virtual_server_free(server);
+ } else {
+ last = &(server->next);
+ }
+ }
+ }
+}
+
static void indexed_modcallable_free(void *data)
{
indexed_modcallable *c = data;
static int indexed_modcallable_cmp(const void *one, const void *two)
{
- int rcode;
const indexed_modcallable *a = one;
const indexed_modcallable *b = two;
- if (a->server && !b->server) return -1;
- if (!a->server && b->server) return +1;
- if (a->server && b->server) {
- rcode = strcmp(a->server, b->server);
- if (rcode != 0) return rcode;
- }
-
if (a->comp < b->comp) return -1;
if (a->comp > b->comp) return +1;
}
+static void module_instance_free_old(CONF_SECTION *cs, module_instance_t *node,
+ time_t when)
+{
+ fr_module_hup_t *mh, **last;
+
+ /*
+ * Walk the list, freeing up old instances.
+ */
+ last = &(node->mh);
+ while (*last) {
+ mh = *last;
+
+ /*
+ * Free only every 60 seconds.
+ */
+ if ((when - mh->when) < 60) {
+ last = &(mh->next);
+ continue;
+ }
+
+ cf_section_parse_free(cs, mh->insthandle);
+
+ if (node->entry->module->detach) {
+ (node->entry->module->detach)(mh->insthandle);
+ } else {
+ free(mh->insthandle);
+ }
+
+ *last = mh->next;
+ free(mh);
+ }
+}
+
+
/*
* Free a module instance.
*/
{
module_instance_t *this = data;
- if (this->entry->module->detach) {
- int i;
+ module_instance_free_old(this->cs, this, time(NULL) + 100);
+ if (this->entry->module->detach) {
(this->entry->module->detach)(this->insthandle);
- for (i = 0; i < 16; i++) {
- if (this->old_insthandle[i]) {
- (this->entry->module->detach)(this->old_insthandle[i]);
- }
- }
}
#ifdef HAVE_PTHREAD_H
int detach_modules(void)
{
rbtree_free(instance_tree);
- rbtree_free(components);
rbtree_free(module_tree);
lt_dlexit();
{
module_entry_t myentry;
module_entry_t *node;
- lt_dlhandle handle;
+ lt_dlhandle handle = NULL;
char module_struct[256];
char *p;
const module_t *module;
if (node) return node;
/*
- * Keep the handle around so we can dlclose() it.
- */
- handle = lt_dlopenext(module_name);
- if (handle == NULL) {
- cf_log_err(cf_sectiontoitem(cs),
- "Failed to link to module '%s': %s\n",
- module_name, lt_dlerror());
- return NULL;
- }
-
- /*
* Link to the module's rlm_FOO{} module structure.
*
* The module_name variable has the version number
p = strrchr(module_struct, '-');
if (p) *p = '\0';
+#if defined(WITHOUT_LIBLTDL) && defined (WITH_DLOPEN) && defined(RTLD_SELF)
+ module = lt_dlsym(RTLD_SELF, module_struct);
+ if (module) goto open_self;
+#endif
+
+ /*
+ * Keep the handle around so we can dlclose() it.
+ */
+ handle = fr_dlopenext(module_name);
+ if (handle == NULL) {
+ cf_log_err(cf_sectiontoitem(cs),
+ "Failed to link to module '%s': %s\n",
+ module_name, lt_dlerror());
+ return NULL;
+ }
+
DEBUG3(" (Loaded %s, checking if it's valid)", module_name);
/*
lt_dlclose(handle);
return NULL;
}
+
+#if defined(WITHOUT_LIBLTDL) && defined (WITH_DLOPEN) && defined(RTLD_SELF)
+ open_self:
+#endif
/*
* Before doing anything else, check if it's sane.
*/
* Find a module instance.
*/
module_instance_t *find_module_instance(CONF_SECTION *modules,
- const char *instname)
+ const char *instname, int do_link)
{
+ int check_config_safe = FALSE;
CONF_SECTION *cs;
- const char *name1, *name2;
+ const char *name1;
module_instance_t *node, myNode;
char module_name[256];
node = rbtree_finddata(instance_tree, &myNode);
if (node) return node;
+ if (!do_link) return NULL;
+
name1 = cf_section_name1(cs);
- name2 = cf_section_name2(cs);
/*
* Found the configuration entry.
memset(node, 0, sizeof(*node));
node->insthandle = NULL;
+ node->cs = cs;
/*
* Names in the "modules" section aren't prefixed
if (check_config && (node->entry->module->instantiate) &&
(node->entry->module->type & RLM_TYPE_CHECK_CONFIG_SAFE) == 0) {
+ const char *value = NULL;
+ CONF_PAIR *cp;
+
+ cp = cf_pair_find(cs, "force_check_config");
+ if (cp) value = cf_pair_value(cp);
+
+ if (value && (strcmp(value, "yes") == 0)) goto print_inst;
+
cf_log_module(cs, "Skipping instantiation of %s", instname);
} else {
- cf_log_module(cs, "Instantiating %s", instname);
+ print_inst:
+ check_config_safe = TRUE;
+ cf_log_module(cs, "Instantiating module \"%s\" from file %s",
+ instname, cf_section_filename(cs));
}
/*
* Call the module's instantiation routine.
*/
if ((node->entry->module->instantiate) &&
- (!check_config ||
- ((node->entry->module->type & RLM_TYPE_CHECK_CONFIG_SAFE) != 0)) &&
+ (!check_config || check_config_safe) &&
((node->entry->module->instantiate)(cs, &node->insthandle) < 0)) {
cf_log_err(cf_sectiontoitem(cs),
"Instantiation failed for module \"%s\"",
return node;
}
-static indexed_modcallable *lookup_by_index(const char *server, int comp,
- int idx)
+static indexed_modcallable *lookup_by_index(rbtree_t *components,
+ int comp, int idx)
{
indexed_modcallable myc;
myc.comp = comp;
myc.idx = idx;
- myc.server = server;
return rbtree_finddata(components, &myc);
}
/*
* Create a new sublist.
*/
-static indexed_modcallable *new_sublist(const char *server, int comp, int idx)
+static indexed_modcallable *new_sublist(rbtree_t *components, int comp, int idx)
{
indexed_modcallable *c;
- c = lookup_by_index(server, comp, idx);
+ c = lookup_by_index(components, comp, idx);
/* It is an error to try to create a sublist that already
* exists. It would almost certainly be caused by accidental
c = rad_malloc(sizeof(*c));
c->modulelist = NULL;
- c->server = server;
c->comp = comp;
c->idx = idx;
return c;
}
-static int indexed_modcall(int comp, int idx, REQUEST *request)
+int indexed_modcall(int comp, int idx, REQUEST *request)
{
int rcode;
- indexed_modcallable *this;
modcallable *list = NULL;
+ virtual_server_t *server;
- this = lookup_by_index(request->server, comp, idx);
- if (!this) {
- if (idx != 0) DEBUG2(" WARNING: Unknown value specified for %s. Cannot perform requested action.",
- section_type_value[comp].typename);
- } else {
- list = this->modulelist;
+ /*
+ * Hack to find the correct virtual server.
+ */
+ rcode = virtual_server_idx(request->server);
+ for (server = virtual_servers[rcode];
+ server != NULL;
+ server = server->next) {
+ if (!request->server && !server->name) break;
+
+ if ((request->server && server->name) &&
+ (strcmp(request->server, server->name) == 0)) break;
}
+ if (!server) {
+ RDEBUG("No such virtual server \"%s\"", request->server);
+ return RLM_MODULE_FAIL;
+ }
+
+ if (idx == 0) {
+ list = server->mc[comp];
+ if (!list) RDEBUG2(" WARNING: Empty %s section. Using default return values.", section_type_value[comp].section);
+
+ } else {
+ indexed_modcallable *this;
+
+ this = lookup_by_index(server->components, comp, idx);
+ if (this) {
+ list = this->modulelist;
+ } else {
+ RDEBUG2(" WARNING: Unknown value specified for %s. Cannot perform requested action.",
+ section_type_value[comp].typename);
+ }
+ }
+
+ if (server->subcs[comp]) {
+ if (idx == 0) {
+ RDEBUG("# Executing section %s from file %s",
+ section_type_value[comp].section,
+ cf_section_filename(server->subcs[comp]));
+ } else {
+ RDEBUG("# Executing group from file %s",
+ cf_section_filename(server->subcs[comp]));
+ }
+ }
request->component = section_type_value[comp].section;
rcode = modcall(comp, list, request);
- request->module = "<server-core>";
- request->component = "<server-core>";
+ request->module = "";
+ request->component = "<core>";
return rcode;
}
* block
*/
static int load_subcomponent_section(modcallable *parent, CONF_SECTION *cs,
- const char *server, int comp)
+ rbtree_t *components, int attr, int comp)
{
indexed_modcallable *subcomp;
modcallable *ml;
const char *name2 = cf_section_name2(cs);
rad_assert(comp >= RLM_COMPONENT_AUTH);
- rad_assert(comp <= RLM_COMPONENT_COUNT);
+ rad_assert(comp < RLM_COMPONENT_COUNT);
/*
* Sanity check.
* automatically. If it isn't found, it's a serious
* error.
*/
- dval = dict_valbyname(section_type_value[comp].attr, name2);
+ dval = dict_valbyname(attr, 0, name2);
if (!dval) {
cf_log_err(cf_sectiontoitem(cs),
"%s %s Not previously configured",
return 0;
}
- subcomp = new_sublist(server, comp, dval->value);
+ subcomp = new_sublist(components, comp, dval->value);
if (!subcomp) {
modcallable_free(&ml);
return 1;
* If the value already exists, don't
* create it again.
*/
- dval = dict_valbyname(dattr->attr, name);
+ dval = dict_valbyname(dattr->attr, dattr->vendor, name);
if (dval) return 1;
/*
*/
do {
value = fr_rand() & 0x00ffffff;
- } while (dict_valbyattr(dattr->attr, value));
+ } while (dict_valbyattr(dattr->attr, dattr->vendor, value));
if (dict_addvalue(name, dattr->name, value) < 0) {
- radlog(L_ERR, "%s", librad_errstr);
+ radlog(L_ERR, "%s", fr_strerror());
return 0;
}
}
static int load_component_section(CONF_SECTION *cs,
- const char *server, int comp)
+ rbtree_t *components, int comp)
{
modcallable *this;
CONF_ITEM *modref;
/*
* Find the attribute used to store VALUEs for this section.
*/
- dattr = dict_attrbyvalue(section_type_value[comp].attr);
+ dattr = dict_attrbyvalue(section_type_value[comp].attr, 0);
if (!dattr) {
cf_log_err(cf_sectiontoitem(cs),
"No such attribute %s",
if (strcmp(name1,
section_type_value[comp].typename) == 0) {
if (!load_subcomponent_section(NULL, scs,
- server, comp)) {
+ components,
+ dattr->attr,
+ comp)) {
return -1; /* FIXME: memleak? */
}
continue;
} else {
modrefname = cf_section_name2(scs);
if (!modrefname) {
+ modcallable_free(&this);
cf_log_err(cf_sectiontoitem(cs),
"Errors parsing %s sub-section.\n",
cf_section_name1(scs));
}
}
- dval = dict_valbyname(PW_AUTH_TYPE, modrefname);
+ dval = dict_valbyname(PW_AUTH_TYPE, 0, modrefname);
if (!dval) {
/*
* It's a section, but nothing we
* recognize. Die!
*/
+ modcallable_free(&this);
cf_log_err(cf_sectiontoitem(cs),
"Unknown Auth-Type \"%s\" in %s sub-section.",
modrefname, section_type_value[comp].section);
idx = 0;
}
- subcomp = new_sublist(server, comp, idx);
+ subcomp = new_sublist(components, comp, idx);
if (subcomp == NULL) {
modcallable_free(&this);
continue;
static int load_byserver(CONF_SECTION *cs)
{
int comp, flag;
- const char *server = cf_section_name2(cs);
+ const char *name = cf_section_name2(cs);
+ rbtree_t *components;
+ virtual_server_t *server = NULL;
+ indexed_modcallable *c;
+
+ if (name) {
+ cf_log_info(cs, "server %s { # from file %s",
+ name, cf_section_filename(cs));
+ } else {
+ cf_log_info(cs, "server { # from file %s",
+ cf_section_filename(cs));
+ }
cf_log_info(cs, " modules {");
+ components = rbtree_create(indexed_modcallable_cmp,
+ indexed_modcallable_free, 0);
+ if (!components) {
+ radlog(L_ERR, "Failed to initialize components\n");
+ goto error;
+ }
+
+ server = rad_malloc(sizeof(*server));
+ memset(server, 0, sizeof(*server));
+
+ server->name = name;
+ server->created = time(NULL);
+ server->cs = cs;
+ server->components = components;
+
/*
* Define types first.
*/
/*
* Find the attribute used to store VALUEs for this section.
*/
- dattr = dict_attrbyvalue(section_type_value[comp].attr);
+ dattr = dict_attrbyvalue(section_type_value[comp].attr, 0);
if (!dattr) {
cf_log_err(cf_sectiontoitem(subcs),
"No such attribute %s",
section_type_value[comp].typename);
- cf_log_info(cs, " }");
+ error:
+ if (debug_flag == 0) {
+ radlog(L_ERR, "Failed to load virtual server %s",
+ (name != NULL) ? name : "<default>");
+ }
+ virtual_server_free(server);
return -1;
}
cf_item_is_pair(modref)) {
CONF_PAIR *cp = cf_itemtopair(modref);
if (!define_type(dattr, cf_pair_attr(cp))) {
- return -1;
+ goto error;
}
continue;
if (strcmp(name1, section_type_value[comp].typename) == 0) {
if (!define_type(dattr,
cf_section_name2(subsubcs))) {
- cf_log_info(cs, " }");
- return -1;
+ goto error;
}
}
}
cf_log_module(cs, "Checking %s {...} for more modules to load",
section_type_value[comp].section);
- if (load_component_section(subcs, server, comp) < 0) {
- cf_log_info(cs, " }");
- return -1;
+ /*
+ * Skip pre/post-proxy sections if we're not
+ * proxying.
+ */
+ if (
+#ifdef WITH_PROXY
+ !mainconfig.proxy_requests &&
+#endif
+ ((comp == RLM_COMPONENT_PRE_PROXY) ||
+ (comp == RLM_COMPONENT_POST_PROXY))) {
+ continue;
+ }
+
+ if (load_component_section(subcs, components, comp) < 0) {
+ goto error;
}
+
+ /*
+ * Cache a default, if it exists. Some people
+ * put empty sections for some reason...
+ */
+ c = lookup_by_index(components, comp, 0);
+ if (c) server->mc[comp] = c->modulelist;
+
+ server->subcs[comp] = subcs;
+
flag = 1;
} /* loop over components */
subcs = cf_section_sub_find(cs, "vmps");
if (subcs) {
cf_log_module(cs, "Checking vmps {...} for more modules to load");
- if (load_component_section(subcs, server,
+ if (load_component_section(subcs, components,
RLM_COMPONENT_POST_AUTH) < 0) {
- return -1;
+ goto error;
}
+ c = lookup_by_index(components,
+ RLM_COMPONENT_POST_AUTH, 0);
+ if (c) server->mc[RLM_COMPONENT_POST_AUTH] = c->modulelist;
flag = 1;
}
+
+#ifdef WITH_DHCP
+ if (!flag) {
+ const DICT_ATTR *dattr;
+
+ dattr = dict_attrbyname("DHCP-Message-Type");
+
+ /*
+ * Handle each DHCP Message type separately.
+ */
+ if (dattr) for (subcs = cf_subsection_find_next(cs, NULL, "dhcp");
+ subcs != NULL;
+ subcs = cf_subsection_find_next(cs, subcs,
+ "dhcp")) {
+ const char *name2 = cf_section_name2(subcs);
+
+ DEBUG2(" Module: Checking dhcp %s {...} for more modules to load", name2);
+ if (!load_subcomponent_section(NULL, subcs,
+ components,
+ dattr->attr,
+ RLM_COMPONENT_POST_AUTH)) {
+ goto error; /* FIXME: memleak? */
+ }
+ c = lookup_by_index(components,
+ RLM_COMPONENT_POST_AUTH, 0);
+ if (c) server->mc[RLM_COMPONENT_POST_AUTH] = c->modulelist;
+ flag = 1;
+ }
+ }
+#endif
}
- cf_log_info(cs, " }");
+ cf_log_info(cs, " } # modules");
+ cf_log_info(cs, "} # server");
- if (!flag && server) {
+ if (!flag && name) {
DEBUG("WARNING: Server %s is empty, and will do nothing!",
- server);
+ name);
+ }
+
+ if (debug_flag == 0) {
+ radlog(L_INFO, "Loaded virtual server %s",
+ (name != NULL) ? name : "<default>");
+ }
+
+ /*
+ * Now that it is OK, insert it into the list.
+ *
+ * This is thread-safe...
+ */
+ comp = virtual_server_idx(name);
+ server->next = virtual_servers[comp];
+ virtual_servers[comp] = server;
+
+ /*
+ * Mark OLDER ones of the same name as being unused.
+ */
+ server = server->next;
+ while (server) {
+ if ((!name && !server->name) ||
+ (name && server->name &&
+ (strcmp(server->name, name) == 0))) {
+ server->can_free = TRUE;
+ break;
+ }
+ server = server->next;
+ }
+
+ return 0;
+}
+
+
+/*
+ * Load all of the virtual servers.
+ */
+int virtual_servers_load(CONF_SECTION *config)
+{
+ int null_server = FALSE;
+ CONF_SECTION *cs;
+ static int first_time = TRUE;
+
+ DEBUG2("%s: #### Loading Virtual Servers ####", mainconfig.name);
+
+ /*
+ * Load all of the virtual servers.
+ */
+ for (cs = cf_subsection_find_next(config, NULL, "server");
+ cs != NULL;
+ cs = cf_subsection_find_next(config, cs, "server")) {
+ if (!cf_section_name2(cs)) null_server = TRUE;
+
+ if (load_byserver(cs) < 0) {
+ /*
+ * Once we successfully staryed once,
+ * continue loading the OTHER servers,
+ * even if one fails.
+ */
+ if (!first_time) continue;
+ return -1;
+ }
}
+ /*
+ * No empty server defined. Try to load an old-style
+ * one for backwards compatibility.
+ */
+ if (!null_server) {
+ if (load_byserver(config) < 0) {
+ return -1;
+ }
+ }
+
+ /*
+ * If we succeed the first time around, remember that.
+ */
+ first_time = FALSE;
+
return 0;
}
+int module_hup_module(CONF_SECTION *cs, module_instance_t *node, time_t when)
+{
+ void *insthandle = NULL;
+ fr_module_hup_t *mh;
+
+ if (!node ||
+ !node->entry->module->instantiate ||
+ ((node->entry->module->type & RLM_TYPE_HUP_SAFE) == 0)) {
+ return 1;
+ }
+
+ cf_log_module(cs, "Trying to reload module \"%s\"", node->name);
+
+ if ((node->entry->module->instantiate)(cs, &insthandle) < 0) {
+ cf_log_err(cf_sectiontoitem(cs),
+ "HUP failed for module \"%s\". Using old configuration.",
+ node->name);
+ return 0;
+ }
+
+ radlog(L_INFO, " Module: Reloaded module \"%s\"", node->name);
+
+ module_instance_free_old(cs, node, when);
+
+ /*
+ * Save the old instance handle for later deletion.
+ */
+ mh = rad_malloc(sizeof(*mh));
+ mh->mi = node;
+ mh->when = when;
+ mh->insthandle = node->insthandle;
+ mh->next = node->mh;
+ node->mh = mh;
+
+ node->insthandle = insthandle;
+
+ /*
+ * FIXME: Set a timeout to come back in 60s, so that
+ * we can pro-actively clean up the old instances.
+ */
+
+ return 1;
+}
+
int module_hup(CONF_SECTION *modules)
{
CONF_SECTION *cs;
module_instance_t *node;
- static int insthandle_counter = -1;
- static time_t hup_times[16];
-
if (!modules) return 0;
- if (insthandle_counter < 0) {
- memset(hup_times, 0, sizeof(hup_times));
- insthandle_counter = 0;
- }
-
when = time(NULL);
/*
for (ci=cf_item_find_next(modules, NULL);
ci != NULL;
ci=cf_item_find_next(modules, ci)) {
- int i;
- void *insthandle = NULL;
const char *instname;
module_instance_t myNode;
strlcpy(myNode.name, instname, sizeof(myNode.name));
node = rbtree_finddata(instance_tree, &myNode);
- if (!node ||
- !node->entry->module->instantiate ||
- ((node->entry->module->type & RLM_TYPE_HUP_SAFE) == 0)) {
- continue;
- }
- cf_log_module(cs, "Trying to reload module \"%s\"", node->name);
-
- if ((node->entry->module->instantiate)(cs, &insthandle) < 0) {
- cf_log_err(cf_sectiontoitem(cs),
- "HUP failed for module \"%s\". Using old configuration.",
- node->name);
- continue;
- }
-
- radlog(L_INFO, " Module: Reloaded module \"%s\"", node->name);
-
- /*
- * Free all configurations old enough to be
- * deleted. This is slightly wasteful, but easy
- * to do.
- *
- * We permit HUPs every 5s, and we cache the last
- * 16 configurations. So the current entry at
- * insthandle_counter will either be empty, OR will
- * be at least (5*16) = 80s old. The following check
- * ensures that it will be deleted.
- */
- for (i = 0; i < 16; i++) {
- if ((int) (when - hup_times[insthandle_counter]) < 60)
- continue;
-
- if (!node->old_insthandle[i]) continue;
-
- cf_section_parse_free(cs, node->old_insthandle[i]);
-
- if (node->entry->module->detach) {
- (node->entry->module->detach)(node->old_insthandle[i]);
- }
- node->old_insthandle[i] = NULL;
- }
-
- /*
- * Save the old instance handle for later deletion.
- */
- node->old_insthandle[insthandle_counter] = node->insthandle;
- node->insthandle = insthandle;
-
- /*
- * FIXME: Set a timeout to come back in 60s, so that
- * we can pro-actively clean up the old instances.
- */
+ module_hup_module(cs, node, when);
}
- /*
- * Remember when we were last HUP'd.
- */
- hup_times[insthandle_counter] = when;
- insthandle_counter++;
- insthandle_counter &= 0x0f;
-
return 1;
}
{
CONF_SECTION *cs, *modules;
rad_listen_t *listener;
- int null_server = FALSE;
if (reload) return 0;
*/
if (!reload) {
/*
+ * This line works around a completely
+ *
+ * RIDICULOUS INSANE IDIOTIC
+ *
+ * bug in libltdl on certain systems. The "set
+ * preloaded symbols" macro below ends up
+ * referencing this name, but it isn't defined
+ * anywhere in the libltdl source. As a result,
+ * any program STUPID enough to rely on libltdl
+ * fails to link, because the symbol isn't
+ * defined anywhere.
+ *
+ * It's like libtool and libltdl are some kind
+ * of sick joke.
+ */
+#ifdef IE_LIBTOOL_DIE
+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
+#endif
+
+ /*
* Set the default list of preloaded symbols.
* This is used to initialize libltdl's list of
* preloaded modules.
}
}
- components = rbtree_create(indexed_modcallable_cmp,
- indexed_modcallable_free, 0);
- if (!components) {
- radlog(L_ERR, "Failed to initialize components\n");
- return -1;
- }
+ memset(virtual_servers, 0, sizeof(virtual_servers));
/*
* Remember where the modules were stored.
return -1;
}
- DEBUG2("radiusd: #### Instantiating modules ####");
+ DEBUG2("%s: #### Instantiating modules ####", mainconfig.name);
/*
* Look for the 'instantiate' section, which tells us
ci=cf_item_find_next(cs, ci)) {
/*
- * Skip sections. They'll be handled
- * later, if they're referenced at all...
+ * Skip sections and "other" stuff.
+ * Sections will be handled later, if
+ * they're referenced at all...
*/
- if (cf_item_is_section(ci)) {
+ if (!cf_item_is_pair(ci)) {
continue;
}
cp = cf_itemtopair(ci);
name = cf_pair_attr(cp);
- module = find_module_instance(modules, name);
+ module = find_module_instance(modules, name, 1);
if (!module) {
return -1;
}
listener = listener->next) {
char buffer[256];
+#ifdef WITH_PROXY
if (listener->type == RAD_LISTEN_PROXY) continue;
+#endif
cs = cf_section_sub_find_name2(config,
"server", listener->server);
}
}
- DEBUG2("radiusd: #### Loading Virtual Servers ####");
-
- /*
- * Load all of the virtual servers.
- */
- for (cs = cf_subsection_find_next(config, NULL, "server");
- cs != NULL;
- cs = cf_subsection_find_next(config, cs, "server")) {
- const char *name2 = cf_section_name2(cs);
-
- if (name2) {
- cf_log_info(cs, "server %s {", name2);
- } else {
- cf_log_info(cs, "server {");
- null_server = TRUE;
- }
- if (load_byserver(cs) < 0) {
- cf_log_info(cs, "}");
- return -1;
- }
- cf_log_info(cs, "}");
- }
-
- /*
- * No empty server defined. Try to load an old-style
- * one for backwards compatibility.
- */
- if (!null_server) {
- cf_log_info(cs, "server {");
- if (load_byserver(config) < 0) {
- cf_log_info(cs, "}");
- return -1;
- }
- cf_log_info(cs, "}");
- }
+ if (virtual_servers_load(config) < 0) return -1;
return 0;
}
return indexed_modcall(RLM_COMPONENT_AUTH, auth_type, request);
}
+#ifdef WITH_ACCOUNTING
/*
* Do pre-accounting for ALL configured sessions
*/
{
return indexed_modcall(RLM_COMPONENT_ACCT, acct_type, request);
}
+#endif
+#ifdef WITH_SESSION_MGMT
/*
* See if a user is already logged in.
*
return (request->simul_count < maxsimul) ? 0 : request->simul_mpp;
}
+#endif
+#ifdef WITH_PROXY
/*
* Do pre-proxying for ALL configured sessions
*/
{
return indexed_modcall(RLM_COMPONENT_POST_PROXY, type, request);
}
+#endif
/*
* Do post-authentication for ALL configured sessions
{
return indexed_modcall(RLM_COMPONENT_POST_AUTH, postauth_type, request);
}
+
+#ifdef WITH_COA
+int module_recv_coa(int recv_coa_type, REQUEST *request)
+{
+ return indexed_modcall(RLM_COMPONENT_RECV_COA, recv_coa_type, request);
+}
+
+int module_send_coa(int send_coa_type, REQUEST *request)
+{
+ return indexed_modcall(RLM_COMPONENT_SEND_COA, send_coa_type, request);
+}
+#endif
projects / freeradius.git / blobdiff