提交 6ca95447 编写于 作者: K Kozlov Dmitry

ippool: fixed initialization order

上级 bf97ff97
......@@ -317,7 +317,12 @@ static int parse_vendor_opt(const char *opt)
}
#endif
static void ippool_init(void)
static void ippool_init1(void)
{
ipdb_register(&ipdb);
}
static void ippool_init2(void)
{
struct conf_sect_t *s = conf_get_section("ip-pool");
struct conf_option_t *opt;
......@@ -367,13 +372,12 @@ static void ippool_init(void)
list_for_each_entry(p, &pool_list, entry)
generate_pool(p);
ipdb_register(&ipdb);
#ifdef RADIUS
if (triton_module_loaded("radius"))
triton_event_register_handler(EV_RADIUS_ACCESS_ACCEPT, (triton_event_func)ev_radius_access_accept);
#endif
}
DEFINE_INIT(51, ippool_init);
DEFINE_INIT(51, ippool_init1);
DEFINE_INIT2(52, ippool_init2);
......@@ -140,5 +140,6 @@ void triton_terminate(void);
(type *)( (char *)__mptr - offsetof(type,member) );})
#define DEFINE_INIT(o, func) static void __init __init__(void){triton_register_init(o,func);}
#define DEFINE_INIT2(o, func) static void __init __init2__(void){triton_register_init(o,func);}
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册