static u32 acl_plugin_register_user_module (char *user_module_name, char *val1_label, char *val2_label)
{
acl_main_t *am = &acl_main;
- void *oldheap = acl_plugin_set_heap();
+ /*
+ * Because folks like to call this early on,
+ * use the global heap, so as to avoid
+ * initializing the main ACL heap before
+ * they start using ACLs.
+ */
u32 user_id = get_acl_user_id(am, user_module_name, val1_label, val2_label);
- clib_mem_set_heap (oldheap);
return user_id;
}
if (!acl_user_id_valid(am, acl_user_id))
return VNET_API_ERROR_INVALID_REGISTRATION;
- void *oldheap = acl_plugin_set_heap ();
-
+ /*
+ * The lookup context index allocation is
+ * an operation done within the global heap,
+ * so no heap switching necessary.
+ */
pool_get(am->acl_lookup_contexts, acontext);
acontext->acl_indices = 0;
u32 new_context_id = acontext - am->acl_lookup_contexts;
vec_add1(am->acl_users[acl_user_id].lookup_contexts, new_context_id);
- clib_mem_set_heap (oldheap);
return new_context_id;
}
/*
* Release the lookup context index and destroy
- * any asssociated data structures.
+ * any associated data structures.
*/
static void acl_plugin_put_lookup_context_index (u32 lc_index)
{
clib_error_t *acl_plugin_methods_vtable_init(acl_plugin_methods_t *m)
{
m->p_acl_main = &acl_main;
-#define _(name) m->name = acl_plugin_ ## name; clib_warning("Setting method " #name " to %p\n", acl_plugin_ ## name);
+#define _(name) m->name = acl_plugin_ ## name;
foreach_acl_plugin_exported_method_name
#undef _
return 0;