File c_icap-0.3.5-rename_CONF_to_IC_CONF.patch of Package c-icap
Index: winnt_server.c
===================================================================
--- winnt_server.c.orig 2013-12-27 16:08:30.000000000 +0100
+++ winnt_server.c 2015-06-02 07:34:41.206086650 +0200
@@ -62,7 +62,7 @@ TCHAR *C_ICAP_CMD = TEXT("c-icap.exe -c"
extern int KEEPALIVE_TIMEOUT;
extern int MAX_SECS_TO_LINGER;
extern int MAX_REQUESTS_BEFORE_REALLOCATE_MEM;
-extern struct ci_server_conf CONF;
+extern struct ci_server_conf IC_CONF;
ci_socket LISTEN_SOCKET;
#define hard_close_connection(connection) ci_hard_close(connection->fd)
@@ -340,11 +340,11 @@ void child_main(ci_socket sockfd)
threads_list =
- (server_decl_t **) malloc((CONF.THREADS_PER_CHILD + 1) *
+ (server_decl_t **) malloc((IC_CONF.THREADS_PER_CHILD + 1) *
sizeof(server_decl_t *));
- con_queue = init_queue(CONF.THREADS_PER_CHILD);
+ con_queue = init_queue(IC_CONF.THREADS_PER_CHILD);
- for (i = 0; i < CONF.THREADS_PER_CHILD; i++) {
+ for (i = 0; i < IC_CONF.THREADS_PER_CHILD; i++) {
if ((threads_list[i] = newthread(con_queue)) == NULL) {
exit(-1); // FATAL error.....
}
@@ -352,7 +352,7 @@ void child_main(ci_socket sockfd)
(void *(*)(void *)) thread_main,
(void *) threads_list[i]);
}
- threads_list[CONF.THREADS_PER_CHILD] = NULL;
+ threads_list[IC_CONF.THREADS_PER_CHILD] = NULL;
ci_debug_printf(1, "Threads created ....\n");
retcode = ci_thread_create(&worker_thread,
(void *(*)(void *)) worker_main,
@@ -614,7 +614,7 @@ int do_child()
}
ci_debug_printf(1, "Shared memory attached....\n");
child_data =
- register_child(&childs_queue, child_handle, CONF.THREADS_PER_CHILD,
+ register_child(&childs_queue, child_handle, IC_CONF.THREADS_PER_CHILD,
parent_pipe);
ci_debug_printf(1, "child registered ....\n");
@@ -751,14 +751,14 @@ int start_server()
ci_proc_mutex_init(&accept_mutex);
ci_thread_mutex_init(&control_process_mtx);
- if (!create_childs_queue(&childs_queue, CONF.MAX_SERVERS)) {
+ if (!create_childs_queue(&childs_queue, IC_CONF.MAX_SERVERS)) {
log_server(NULL, "Can't init shared memory.Fatal error, exiting!\n");
ci_debug_printf(1,
"Can't init shared memory.Fatal error, exiting!\n");
exit(0);
}
- for (i = 0; i < CONF.START_SERVERS + 2; i++) {
+ for (i = 0; i < IC_CONF.START_SERVERS + 2; i++) {
child_handle = start_child(LISTEN_SOCKET);
}
@@ -777,12 +777,12 @@ int start_server()
"Server stats: \n\t Children:%d\n\t Free servers:%d\n\tUsed servers:%d\n\tRequests served:%d\n",
childs, freeservers, used, maxrequests);
- if ((freeservers <= CONF.MIN_SPARE_THREADS && childs < CONF.MAX_SERVERS)
- || childs < CONF.START_SERVERS) {
+ if ((freeservers <= IC_CONF.MIN_SPARE_THREADS && childs < IC_CONF.MAX_SERVERS)
+ || childs < IC_CONF.START_SERVERS) {
ci_debug_printf(1, "Going to start a child .....\n");
child_handle = start_child(LISTEN_SOCKET);
}
- else if (freeservers >= CONF.MAX_SPARE_THREADS && childs > CONF.START_SERVERS) {
+ else if (freeservers >= IC_CONF.MAX_SPARE_THREADS && childs > IC_CONF.START_SERVERS) {
ci_thread_mutex_lock(&control_process_mtx);
if ((child_indx = find_an_idle_child(&childs_queue)) < 0)
continue;
@@ -794,7 +794,7 @@ int start_server()
}
}
/*
- for(i=0;i<CONF.START_SERVERS;i++){
+ for(i=0;i<IC_CONF.START_SERVERS;i++){
pid=wait(&status);
ci_debug_printf(1,"The child %d died with status %d\n",pid,status);
}
@@ -804,7 +804,7 @@ int start_server()
#else
child_data = (child_shared_data_t *) malloc(sizeof(child_shared_data_t));
child_data->pid = 0;
- child_data->freeservers = CONF.THREADS_PER_CHILD;
+ child_data->freeservers = IC_CONF.THREADS_PER_CHILD;
child_data->usedservers = 0;
child_data->requests = 0;
child_data->connections = 0;
Index: service.c
===================================================================
--- service.c.orig 2013-10-25 16:59:57.000000000 +0200
+++ service.c 2015-06-02 07:34:41.206086650 +0200
@@ -368,7 +368,7 @@ ci_service_module_t *add_service(ci_serv
xdata = &service_extra_data_list[services_num];
init_extra_data(xdata, service->mod_name);
if (service->mod_init_service) {
- ret = service->mod_init_service(xdata, &CONF);
+ ret = service->mod_init_service(xdata, &IC_CONF);
if (ret != CI_OK)
xdata->status = CI_SERVICE_ERROR;
else
@@ -449,7 +449,7 @@ int post_init_services()
xdata = &service_extra_data_list[i];
if ( xdata->status == CI_SERVICE_OK) {
ret = service_list[i]->
- mod_post_init_service(xdata, &CONF);
+ mod_post_init_service(xdata, &IC_CONF);
if (ret != CI_OK)
xdata->status = CI_SERVICE_ERROR;
}
@@ -608,7 +608,7 @@ ci_service_module_t *load_c_service(cons
ci_service_module_t *service = NULL;
CI_DLIB_HANDLE service_handle;
- service_handle = ci_module_load(service_file, CONF.SERVICES_DIR);
+ service_handle = ci_module_load(service_file, IC_CONF.SERVICES_DIR);
if (!service_handle)
return NULL;
service = ci_module_sym(service_handle, "service");
Index: aserver.c
===================================================================
--- aserver.c.orig 2013-12-27 16:10:53.000000000 +0100
+++ aserver.c 2015-06-02 07:34:41.206086650 +0200
@@ -125,9 +125,9 @@ int main(int argc, char **argv)
ci_txt_template_set_dir(DATADIR"templates");
commands_init();
- if (!(CONF.MAGIC_DB = ci_magic_db_load(CONF.magics_file))) {
+ if (!(IC_CONF.MAGIC_DB = ci_magic_db_load(IC_CONF.magics_file))) {
ci_debug_printf(1, "Can not load magic file %s!!!\n",
- CONF.magics_file);
+ IC_CONF.magics_file);
}
init_conf_tables();
request_stats_init();
@@ -143,22 +143,22 @@ int main(int argc, char **argv)
}
#if ! defined(_WIN32)
- if (is_icap_running(CONF.PIDFILE)) {
+ if (is_icap_running(IC_CONF.PIDFILE)) {
ci_debug_printf(1, "c-icap server already running!\n");
exit(-1);
}
if (DAEMON_MODE)
run_as_daemon();
- if (!set_running_permissions(CONF.RUN_USER, CONF.RUN_GROUP))
+ if (!set_running_permissions(IC_CONF.RUN_USER, IC_CONF.RUN_GROUP))
exit(-1);
- store_pid(CONF.PIDFILE);
+ store_pid(IC_CONF.PIDFILE);
#endif
- if (!init_server(CONF.ADDRESS, CONF.PORT, &(CONF.PROTOCOL_FAMILY)))
+ if (!init_server(IC_CONF.ADDRESS, IC_CONF.PORT, &(IC_CONF.PROTOCOL_FAMILY)))
return -1;
post_init_modules();
post_init_services();
start_server();
- clear_pid(CONF.PIDFILE);
+ clear_pid(IC_CONF.PIDFILE);
return 0;
}
Index: mpmt_server.c
===================================================================
--- mpmt_server.c.orig 2014-10-23 11:20:46.000000000 +0200
+++ mpmt_server.c 2015-06-02 07:34:41.206086650 +0200
@@ -49,7 +49,7 @@ extern int MAX_KEEPALIVE_REQUESTS;
extern int MAX_SECS_TO_LINGER;
extern int MAX_REQUESTS_BEFORE_REALLOCATE_MEM;
extern int MAX_REQUESTS_PER_CHILD;
-extern struct ci_server_conf CONF;
+extern struct ci_server_conf IC_CONF;
typedef struct server_decl {
int srv_id;
@@ -232,13 +232,13 @@ static void cancel_all_threads()
ci_thread_cond_broadcast(&(con_queue->queue_cond));
/*wait for a milisecond*/
ci_usleep(1000);
- servers_running = CONF.THREADS_PER_CHILD;
+ servers_running = IC_CONF.THREADS_PER_CHILD;
while (servers_running && wait_for_workers >= 0) {
/*child_data->to_be_killed, may change while we are inside this loop*/
if (child_data->to_be_killed == IMMEDIATELY) {
CHILD_HALT = 1;
}
- for (i=0; i<CONF.THREADS_PER_CHILD; i++) {
+ for (i=0; i<IC_CONF.THREADS_PER_CHILD; i++) {
if (threads_list[i] != NULL) { /* if the i thread is still alive*/
if (!threads_list[i]->running) { /*if the i thread is not running any more*/
ci_debug_printf(5, "Cancel server %d, thread_id %lu (%d)\n",
@@ -257,7 +257,7 @@ static void cancel_all_threads()
}
}
}/*the i thread is still alive*/
- } /* for(i=0;i< CONF.THREADS_PER_CHILD;i++)*/
+ } /* for(i=0;i< IC_CONF.THREADS_PER_CHILD;i++)*/
/*wait for 1 second for the next round*/
ci_usleep(999999);
@@ -411,7 +411,7 @@ static int server_reconfigure()
*/
old_childs_queue = childs_queue;
childs_queue = malloc(sizeof(struct childs_queue));
- if (!create_childs_queue(childs_queue, 2 * CONF.MAX_SERVERS)) {
+ if (!create_childs_queue(childs_queue, 2 * IC_CONF.MAX_SERVERS)) {
ci_debug_printf(1,
"Cannot init shared memory. Fatal error, exiting!\n");
return 0; /*It is not enough. We must wait all childs to exit ..... */
@@ -419,10 +419,10 @@ static int server_reconfigure()
/*
Start new childs to handle new requests.
*/
- if (CONF.START_SERVERS > CONF.MAX_SERVERS)
- CONF.START_SERVERS = CONF.MAX_SERVERS;
+ if (IC_CONF.START_SERVERS > IC_CONF.MAX_SERVERS)
+ IC_CONF.START_SERVERS = IC_CONF.MAX_SERVERS;
- for (i = 0; i < CONF.START_SERVERS; i++) {
+ for (i = 0; i < IC_CONF.START_SERVERS; i++) {
start_child(LISTEN_SOCKET);
}
@@ -851,11 +851,11 @@ void child_main(int sockfd, int pipefd)
ci_stat_attach_mem(child_data->stats, child_data->stats_size, NULL);
threads_list =
- (server_decl_t **) malloc((CONF.THREADS_PER_CHILD + 1) *
+ (server_decl_t **) malloc((IC_CONF.THREADS_PER_CHILD + 1) *
sizeof(server_decl_t *));
- con_queue = init_queue(CONF.THREADS_PER_CHILD);
+ con_queue = init_queue(IC_CONF.THREADS_PER_CHILD);
- for (i = 0; i < CONF.THREADS_PER_CHILD; i++) {
+ for (i = 0; i < IC_CONF.THREADS_PER_CHILD; i++) {
if ((threads_list[i] = newthread(con_queue)) == NULL) {
exit(-1); // FATAL error.....
}
@@ -864,7 +864,7 @@ void child_main(int sockfd, int pipefd)
(void *) threads_list[i]);
threads_list[i]->srv_pthread = thread;
}
- threads_list[CONF.THREADS_PER_CHILD] = NULL;
+ threads_list[IC_CONF.THREADS_PER_CHILD] = NULL;
/*Now start the listener thread.... */
ret = ci_thread_create(&thread, (void *(*)(void *)) listener_thread,
(void *) &sockfd);
@@ -957,7 +957,7 @@ int start_child(int fd)
MY_PROC_PID = getpid();
attach_childs_queue(childs_queue);
child_data =
- register_child(childs_queue, getpid(), CONF.THREADS_PER_CHILD, pfd[1]);
+ register_child(childs_queue, getpid(), IC_CONF.THREADS_PER_CHILD, pfd[1]);
close(pfd[1]);
child_main(fd, pfd[0]);
exit(0);
@@ -1026,11 +1026,11 @@ int start_server()
char command_buffer[COMMANDS_BUFFER_SIZE];
int user_informed = 0;
- ctl_socket = ci_named_pipe_create(CONF.COMMANDS_SOCKET);
+ ctl_socket = ci_named_pipe_create(IC_CONF.COMMANDS_SOCKET);
if (ctl_socket < 0) {
ci_debug_printf(1,
"Error opening control socket %s. Fatal error, exiting!\n",
- CONF.COMMANDS_SOCKET);
+ IC_CONF.COMMANDS_SOCKET);
exit(0);
}
@@ -1040,7 +1040,7 @@ int start_server()
exit(0);
}
childs_queue = malloc(sizeof(struct childs_queue));
- if (!create_childs_queue(childs_queue, 2 * CONF.MAX_SERVERS)) {
+ if (!create_childs_queue(childs_queue, 2 * IC_CONF.MAX_SERVERS)) {
ci_proc_mutex_destroy(&accept_mutex);
ci_debug_printf(1,
"Can't init shared memory. Fatal error, exiting!\n");
@@ -1050,10 +1050,10 @@ int start_server()
init_commands();
pid = 1;
#ifdef MULTICHILD
- if (CONF.START_SERVERS > CONF.MAX_SERVERS)
- CONF.START_SERVERS = CONF.MAX_SERVERS;
+ if (IC_CONF.START_SERVERS > IC_CONF.MAX_SERVERS)
+ IC_CONF.START_SERVERS = IC_CONF.MAX_SERVERS;
- for (i = 0; i < CONF.START_SERVERS; i++) {
+ for (i = 0; i < IC_CONF.START_SERVERS; i++) {
if (pid)
pid = start_child(LISTEN_SOCKET);
}
@@ -1068,7 +1068,7 @@ int start_server()
}
if (ret < 0) { /*Eof received on pipe. Going to reopen ... */
ci_named_pipe_close(ctl_socket);
- ctl_socket = ci_named_pipe_open(CONF.COMMANDS_SOCKET);
+ ctl_socket = ci_named_pipe_open(IC_CONF.COMMANDS_SOCKET);
if (ctl_socket < 0) {
ci_debug_printf(1,
"Error opening control socket. We are unstable and going down!");
@@ -1100,16 +1100,16 @@ int start_server()
kill(childs_queue->childs[child_indx].pid, SIGTERM);
}
- else if ((freeservers <= CONF.MIN_SPARE_THREADS && childs < CONF.MAX_SERVERS)
- || childs < CONF.START_SERVERS) {
+ else if ((freeservers <= IC_CONF.MIN_SPARE_THREADS && childs < IC_CONF.MAX_SERVERS)
+ || childs < IC_CONF.START_SERVERS) {
ci_debug_printf(8,
"Free Servers: %d, children: %d. Going to start a child .....\n",
freeservers, childs);
pid = start_child(LISTEN_SOCKET);
}
- else if (freeservers >= CONF.MAX_SPARE_THREADS &&
- childs > CONF.START_SERVERS &&
- (freeservers - CONF.THREADS_PER_CHILD) > CONF.MIN_SPARE_THREADS) {
+ else if (freeservers >= IC_CONF.MAX_SPARE_THREADS &&
+ childs > IC_CONF.START_SERVERS &&
+ (freeservers - IC_CONF.THREADS_PER_CHILD) > IC_CONF.MIN_SPARE_THREADS) {
if ((child_indx = find_an_idle_child(childs_queue)) >= 0) {
childs_queue->childs[child_indx].father_said =
@@ -1124,7 +1124,7 @@ int start_server()
user_informed = 0;
}
}
- else if (childs == CONF.MAX_SERVERS && freeservers < CONF.MIN_SPARE_THREADS) {
+ else if (childs == IC_CONF.MAX_SERVERS && freeservers < IC_CONF.MIN_SPARE_THREADS) {
if(! user_informed) {
ci_debug_printf(1,
"ATTENTION!!!! Not enough available servers (children %d, free servers %d, used servers %d)!!!!! "
@@ -1155,7 +1155,7 @@ int start_server()
#else
child_data = (child_shared_data_t *) malloc(sizeof(child_shared_data_t));
child_data->pid = 0;
- child_data->freeservers = CONF.THREADS_PER_CHILD;
+ child_data->freeservers = IC_CONF.THREADS_PER_CHILD;
child_data->usedservers = 0;
child_data->requests = 0;
child_data->connections = 0;
Index: cfg_param.c
===================================================================
--- cfg_param.c.orig 2014-10-23 11:20:46.000000000 +0200
+++ cfg_param.c 2015-06-02 07:34:41.207086647 +0200
@@ -40,7 +40,7 @@
int ARGC;
char **ARGV;
-struct ci_server_conf CONF = {
+struct ci_server_conf IC_CONF = {
NULL, /* LISTEN ADDRESS */ 1344, /*PORT*/ AF_INET, /*SOCK_FAMILY */
#ifdef _WIN32
"c:\\TEMP", /*TMPDIR*/ "c:\\TEMP\\c-icap.pid", /*PIDFILE*/ "\\\\.\\pipe\\c-icap", /*COMMANDS_SOCKET; */
@@ -134,34 +134,34 @@ struct sub_table {
};
static struct ci_conf_entry conf_variables[] = {
- {"ListenAddress", &CONF.ADDRESS, intl_cfg_set_str, NULL},
- {"PidFile", &CONF.PIDFILE, intl_cfg_set_str, NULL},
- {"CommandsSocket", &CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL},
+ {"ListenAddress", &IC_CONF.ADDRESS, intl_cfg_set_str, NULL},
+ {"PidFile", &IC_CONF.PIDFILE, intl_cfg_set_str, NULL},
+ {"CommandsSocket", &IC_CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL},
{"Timeout", (void *) (&TIMEOUT), intl_cfg_set_int, NULL},
{"KeepAlive", NULL, NULL, NULL},
{"MaxKeepAliveRequests", &MAX_KEEPALIVE_REQUESTS, intl_cfg_set_int, NULL},
{"KeepAliveTimeout", &KEEPALIVE_TIMEOUT, intl_cfg_set_int, NULL},
- {"StartServers", &CONF.START_SERVERS, intl_cfg_set_int, NULL},
- {"MaxServers", &CONF.MAX_SERVERS, intl_cfg_set_int, NULL},
- {"MinSpareThreads", &CONF.MIN_SPARE_THREADS, intl_cfg_set_int, NULL},
- {"MaxSpareThreads", &CONF.MAX_SPARE_THREADS, intl_cfg_set_int, NULL},
- {"ThreadsPerChild", &CONF.THREADS_PER_CHILD, intl_cfg_set_int, NULL},
+ {"StartServers", &IC_CONF.START_SERVERS, intl_cfg_set_int, NULL},
+ {"MaxServers", &IC_CONF.MAX_SERVERS, intl_cfg_set_int, NULL},
+ {"MinSpareThreads", &IC_CONF.MIN_SPARE_THREADS, intl_cfg_set_int, NULL},
+ {"MaxSpareThreads", &IC_CONF.MAX_SPARE_THREADS, intl_cfg_set_int, NULL},
+ {"ThreadsPerChild", &IC_CONF.THREADS_PER_CHILD, intl_cfg_set_int, NULL},
{"MaxRequestsPerChild", &MAX_REQUESTS_PER_CHILD, intl_cfg_set_int, NULL},
{"MaxRequestsReallocateMem", &MAX_REQUESTS_BEFORE_REALLOCATE_MEM,
intl_cfg_set_int, NULL},
- {"Port", &CONF.PORT, intl_cfg_set_int, NULL},
- {"User", &CONF.RUN_USER, intl_cfg_set_str, NULL},
- {"Group", &CONF.RUN_GROUP, intl_cfg_set_str, NULL},
- {"ServerAdmin", &CONF.SERVER_ADMIN, intl_cfg_set_str, NULL},
- {"ServerName", &CONF.SERVER_NAME, intl_cfg_set_str, NULL},
+ {"Port", &IC_CONF.PORT, intl_cfg_set_int, NULL},
+ {"User", &IC_CONF.RUN_USER, intl_cfg_set_str, NULL},
+ {"Group", &IC_CONF.RUN_GROUP, intl_cfg_set_str, NULL},
+ {"ServerAdmin", &IC_CONF.SERVER_ADMIN, intl_cfg_set_str, NULL},
+ {"ServerName", &IC_CONF.SERVER_NAME, intl_cfg_set_str, NULL},
{"LoadMagicFile", NULL, cfg_load_magicfile, NULL},
{"Logger", &default_logger, cfg_set_logger, NULL},
{"ServerLog", &SERVER_LOG_FILE, intl_cfg_set_str, NULL},
{"AccessLog", NULL, cfg_set_accesslog, NULL},
{"LogFormat", NULL, cfg_set_logformat, NULL},
{"DebugLevel", NULL, cfg_set_debug_level, NULL}, /*Set library's debug level */
- {"ServicesDir", &CONF.SERVICES_DIR, intl_cfg_set_str, NULL},
- {"ModulesDir", &CONF.MODULES_DIR, intl_cfg_set_str, NULL},
+ {"ServicesDir", &IC_CONF.SERVICES_DIR, intl_cfg_set_str, NULL},
+ {"ModulesDir", &IC_CONF.MODULES_DIR, intl_cfg_set_str, NULL},
{"Service", NULL, cfg_load_service, NULL},
{"ServiceAlias", NULL, cfg_service_alias, NULL},
{"Module", NULL, cfg_load_module, NULL},
@@ -451,7 +451,7 @@ int cfg_load_magicfile(const char *direc
}
db_file = argv[0];
- if (strcmp(CONF.magics_file, db_file) == 0) {
+ if (strcmp(IC_CONF.magics_file, db_file) == 0) {
ci_debug_printf(2, "The db file %s is the same as default. Ignoring...\n", db_file);
return 1;
}
@@ -461,8 +461,8 @@ int cfg_load_magicfile(const char *direc
ci_debug_printf(1, "Can not load magic file %s!!!\n", db_file);
return 0;
}
- if (!CONF.MAGIC_DB)
- CONF.MAGIC_DB = ndb;
+ if (!IC_CONF.MAGIC_DB)
+ IC_CONF.MAGIC_DB = ndb;
return 1;
}
@@ -517,24 +517,24 @@ int cfg_set_tmp_dir(const char *directiv
return 0;
}
- cfg_default_value_store(&CONF.TMPDIR, &CONF.TMPDIR, sizeof(char *));
+ cfg_default_value_store(&IC_CONF.TMPDIR, &IC_CONF.TMPDIR, sizeof(char *));
len = strlen(argv[0]);
- CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char));
- strcpy(CONF.TMPDIR, argv[0]);
+ IC_CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char));
+ strcpy(IC_CONF.TMPDIR, argv[0]);
#ifdef _WIN32
- if (CONF.TMPDIR[len] != '\\') {
- CONF.TMPDIR[len] = '\\';
- CONF.TMPDIR[len + 1] = '\0';
+ if (IC_CONF.TMPDIR[len] != '\\') {
+ IC_CONF.TMPDIR[len] = '\\';
+ IC_CONF.TMPDIR[len + 1] = '\0';
}
#else
- if (CONF.TMPDIR[len] != '/') {
- CONF.TMPDIR[len] = '/';
- CONF.TMPDIR[len + 1] = '\0';
+ if (IC_CONF.TMPDIR[len] != '/') {
+ IC_CONF.TMPDIR[len] = '/';
+ IC_CONF.TMPDIR[len + 1] = '\0';
}
#endif
/*Check if tmpdir exists. If no try to build it , report an error and uses the default... */
- CI_TMPDIR = CONF.TMPDIR; /*Sets the library's temporary dir to .... */
+ CI_TMPDIR = IC_CONF.TMPDIR; /*Sets the library's temporary dir to .... */
ci_debug_printf(2, "Setting parameter :%s=%s\n", directive, argv[0]);
return 1;
}
@@ -842,7 +842,7 @@ int parse_file(const char *conf_file)
/* #endif */
static struct ci_options_entry options[] = {
- {opt_pre "f", "filename", &CONF.cfg_file, ci_cfg_set_str,
+ {opt_pre "f", "filename", &IC_CONF.cfg_file, ci_cfg_set_str,
"Specify the configuration file"},
{opt_pre "N", NULL, &DAEMON_MODE, ci_cfg_disable, "Do not run as daemon"},
{opt_pre "d", "level", NULL, cfg_set_debug_level_cmd,
@@ -864,7 +864,7 @@ int config(int argc, char **argv)
ci_args_usage(argv[0], options);
exit(-1);
}
- if (!parse_file(CONF.cfg_file)) {
+ if (!parse_file(IC_CONF.cfg_file)) {
ci_debug_printf(1, "Error opening/parsing config file\n");
exit(0);
}
@@ -883,7 +883,7 @@ int reconfig()
"Error in command line options, while reconfiguring!\n");
return 0;
}
- if (!parse_file(CONF.cfg_file)) {
+ if (!parse_file(IC_CONF.cfg_file)) {
ci_debug_printf(1,
"Error opening/parsing config file, while reconfiguring!\n");
return 0;
@@ -923,7 +923,7 @@ void system_shutdown()
Release other subsystems
*/
ci_magic_db_free();
- CONF.MAGIC_DB = NULL;
+ IC_CONF.MAGIC_DB = NULL;
ci_txt_template_close();
}
@@ -939,9 +939,9 @@ int system_reconfigure()
ci_debug_printf(1, "All resources released. Going to reload!\n");
ci_txt_template_init();
- if (!(CONF.MAGIC_DB = ci_magic_db_load(CONF.magics_file))) {
+ if (!(IC_CONF.MAGIC_DB = ci_magic_db_load(IC_CONF.magics_file))) {
ci_debug_printf(1, "Can not load magic file %s!!!\n",
- CONF.magics_file);
+ IC_CONF.magics_file);
}
init_modules();
init_services();
@@ -950,15 +950,15 @@ int system_reconfigure()
- Freeing all memory and resources used by configuration parameters (is it possible???)
- reopen and read config file. Now the monitor process has now the new config parameters.
*/
- old_port = CONF.PORT;
+ old_port = IC_CONF.PORT;
if (!reconfig())
return 0;
/*
- reinit listen socket if needed
*/
- if (old_port != CONF.PORT) {
- init_server(CONF.ADDRESS, CONF.PORT, &(CONF.PROTOCOL_FAMILY));
+ if (old_port != IC_CONF.PORT) {
+ init_server(IC_CONF.ADDRESS, IC_CONF.PORT, &(IC_CONF.PROTOCOL_FAMILY));
}
log_open();
Index: module.c
===================================================================
--- module.c.orig 2013-10-25 16:59:57.000000000 +0200
+++ module.c 2015-06-02 07:34:41.207086647 +0200
@@ -71,7 +71,7 @@ void *load_module(const char *module_fil
void *module = NULL;
CI_DLIB_HANDLE module_handle;
- module_handle = ci_module_load(module_file, CONF.MODULES_DIR);
+ module_handle = ci_module_load(module_file, IC_CONF.MODULES_DIR);
if (!module_handle)
return NULL;
module = ci_module_sym(module_handle, "module");
@@ -146,7 +146,7 @@ static int init_module(void *module, enu
if (((service_handler_module_t *) module)->init_service_handler)
ret =
((service_handler_module_t *) module)->
- init_service_handler(&CONF);
+ init_service_handler(&IC_CONF);
if (((service_handler_module_t *) module)->conf_table)
register_conf_table(((service_handler_module_t *) module)->name,
((service_handler_module_t *) module)->
@@ -154,7 +154,7 @@ static int init_module(void *module, enu
break;
case LOGGER:
if (((logger_module_t *) module)->init_logger)
- ret = ((logger_module_t *) module)->init_logger(&CONF);
+ ret = ((logger_module_t *) module)->init_logger(&IC_CONF);
if (((logger_module_t *) module)->conf_table)
register_conf_table(((logger_module_t *) module)->name,
((logger_module_t *) module)->conf_table,
@@ -165,7 +165,7 @@ static int init_module(void *module, enu
if (((access_control_module_t *) module)->init_access_controller)
ret =
((access_control_module_t *) module)->
- init_access_controller(&CONF);
+ init_access_controller(&IC_CONF);
if (((access_control_module_t *) module)->conf_table)
register_conf_table(((access_control_module_t *) module)->name,
((access_control_module_t *) module)->
@@ -173,7 +173,7 @@ static int init_module(void *module, enu
break;
case AUTH_METHOD:
if (((http_auth_method_t *) module)->init_auth_method)
- ret = ((http_auth_method_t *) module)->init_auth_method(&CONF);
+ ret = ((http_auth_method_t *) module)->init_auth_method(&IC_CONF);
if (((http_auth_method_t *) module)->conf_table)
register_conf_table(((http_auth_method_t *) module)->name,
((http_auth_method_t *) module)->conf_table,
@@ -184,7 +184,7 @@ static int init_module(void *module, enu
if (((authenticator_module_t *) module)->init_authenticator)
ret =
((authenticator_module_t *) module)->
- init_authenticator(&CONF);
+ init_authenticator(&IC_CONF);
if (((authenticator_module_t *) module)->conf_table)
register_conf_table(((authenticator_module_t *) module)->name,
((authenticator_module_t *) module)->
@@ -192,7 +192,7 @@ static int init_module(void *module, enu
break;
case COMMON:
if (((common_module_t *) module)->init_module)
- ret = ((common_module_t *) module)->init_module(&CONF);
+ ret = ((common_module_t *) module)->init_module(&IC_CONF);
if (((common_module_t *) module)->conf_table)
register_conf_table(((common_module_t *) module)->name,
((common_module_t *) module)->conf_table,
@@ -607,7 +607,7 @@ int post_init_modules()
if (((common_module_t *) common_modules.modules[i])->
post_init_module != NULL)
((common_module_t *) common_modules.modules[i])->
- post_init_module(&CONF);
+ post_init_module(&IC_CONF);
}
/* service_handlers */
@@ -615,7 +615,7 @@ int post_init_modules()
if (((service_handler_module_t *) service_handlers.modules[i])->
post_init_service_handler != NULL)
((service_handler_module_t *) service_handlers.modules[i])->
- post_init_service_handler(&CONF);
+ post_init_service_handler(&IC_CONF);
}
/* loggers? loggers do not have post init handlers .... */
@@ -626,7 +626,7 @@ int post_init_modules()
if (((access_control_module_t *) access_controllers.modules[i])->
post_init_access_controller != NULL)
((access_control_module_t *) access_controllers.modules[i])->
- post_init_access_controller(&CONF);
+ post_init_access_controller(&IC_CONF);
}
@@ -636,7 +636,7 @@ int post_init_modules()
if (((http_auth_method_t *) auth_methods.modules[i])->
post_init_auth_method != NULL)
((http_auth_method_t *) auth_methods.modules[i])->
- post_init_auth_method(&CONF);
+ post_init_auth_method(&IC_CONF);
}
/* authenticators */
@@ -644,7 +644,7 @@ int post_init_modules()
if (((authenticator_module_t *) authenticators.modules[i])->
post_init_authenticator != NULL)
((authenticator_module_t *) authenticators.modules[i])->
- post_init_authenticator(&CONF);
+ post_init_authenticator(&IC_CONF);
}
return 1;
@@ -684,7 +684,7 @@ int release_modules()
if (((access_control_module_t *) access_controllers.modules[i])->
release_access_controller != NULL)
((access_control_module_t *) access_controllers.modules[i])->
- release_access_controller(&CONF);
+ release_access_controller(&IC_CONF);
}
RELEASE_MOD_LIST(access_controllers);
@@ -693,7 +693,7 @@ int release_modules()
if (((http_auth_method_t *) auth_methods.modules[i])->
close_auth_method != NULL)
((http_auth_method_t *) auth_methods.modules[i])->
- close_auth_method(&CONF);
+ close_auth_method(&IC_CONF);
}
RELEASE_MOD_LIST(auth_methods);
@@ -702,7 +702,7 @@ int release_modules()
if (((authenticator_module_t *) authenticators.modules[i])->
close_authenticator != NULL)
((authenticator_module_t *) authenticators.modules[i])->
- close_authenticator(&CONF);
+ close_authenticator(&IC_CONF);
}
RELEASE_MOD_LIST(authenticators);
@@ -711,7 +711,7 @@ int release_modules()
if (((common_module_t *) common_modules.modules[i])->
close_module != NULL)
((common_module_t *) common_modules.modules[i])->
- close_module(&CONF);
+ close_module(&IC_CONF);
}
RELEASE_MOD_LIST(common_modules);
Index: include/cfg_param.h
===================================================================
--- include/cfg_param.h.orig 2013-10-25 16:59:54.000000000 +0200
+++ include/cfg_param.h 2015-06-02 07:35:05.180022250 +0200
@@ -126,7 +126,7 @@ struct cfg_default_value{
#define ALIAS_TABLE 2
#ifndef CI_BUILD_LIB
-extern struct ci_server_conf CONF;
+extern struct ci_server_conf IC_CONF;
struct cfg_default_value * cfg_default_value_store(void *param, void *value,int size);
struct cfg_default_value * cfg_default_value_replace(void *param, void *value);
