@@ -241,6 +241,7 @@ struct module_exports exports= {

 	cmds,       /* exported functions */

 	params,     /* exported params */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* initialization module */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -99,6 +99,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -152,6 +152,7 @@ struct module_exports exports = {

 	cmds,

 	params,

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -146,6 +146,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -100,14 +100,15 @@ static param_export_t params[] = {

  * Module interface

  */

 struct module_exports exports = {

-	"auth_diameter", 

-	cmds,       	/* Exported functions */

-	params,     	/* Exported parameters */

-	0,          	/* exported statistics */

-	mod_init,   	/* module initialization function */

-	0,          	/* response function */

-	0,          	/* destroy function */

-	mod_child_init	/* child initialization function */

+	"auth_diameter",

+	cmds,          /* Exported functions */

+	params,        /* Exported parameters */

+	0,             /* exported statistics */

+	0,             /* exported MI functions */

+	mod_init,      /* module initialization function */

+	0,             /* response function */

+	0,             /* destroy function */

+	mod_child_init /* child initialization function */

 };

@@ -94,6 +94,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -98,6 +98,7 @@ struct module_exports exports = {

 	cmds,      /* Exported commands */

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

+	0,         /* exported MI functions */

 	mod_init,  /* module initialization function */

 	0,         /* response function*/

 	0,         /* destroy function */

@@ -152,10 +152,11 @@ static param_export_t params[] = {

 struct module_exports exports = {

 	"avpops",

-	cmds,     /* Exported functions */

-	params,   /* Exported parameters */

+	cmds,       /* Exported functions */

+	params,     /* Exported parameters */

 	0,          /* exported statistics */

-	avpops_init, /* Module initialization function */

+	0,          /* exported MI functions */

+	avpops_init,/* Module initialization function */

 	(response_function) 0,

 	(destroy_function) 0,

 	(child_init_function) avpops_child_init /* per-child init function */

@@ -107,6 +107,7 @@ static int w_process_register_norpl(struct sip_msg* msg, char* str,char* str2);

 static int cpl_process_register(struct sip_msg* msg, int no_rpl);

 static int fixup_cpl_run_script(void** param, int param_no);

 static int cpl_init(void);

+static int mi_child_init();

 static int cpl_child_init(int rank);

 static int cpl_exit(void);

@@ -115,12 +116,12 @@ static int cpl_exit(void);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"cpl_run_script",            cpl_invoke_script,   2,  fixup_cpl_run_script,

-			REQUEST_ROUTE},

-	{"cpl_process_register",      w_process_register,  0,  0,

-			REQUEST_ROUTE},

-	{"cpl_process_register_norpl",w_process_register_norpl,0,0,

-			REQUEST_ROUTE},

+	{"cpl_run_script",            cpl_invoke_script,        2,

+			fixup_cpl_run_script, REQUEST_ROUTE},

+	{"cpl_process_register",      w_process_register,       0,

+			0,                    REQUEST_ROUTE},

+	{"cpl_process_register_norpl",w_process_register_norpl, 0,

+			0,                    REQUEST_ROUTE},

 	{0, 0, 0, 0, 0}

 };

@@ -150,11 +151,25 @@ static param_export_t params[] = {

 };

+/*

+ * Exported MI functions

+ */

+static mi_export_t mi_cmds[] = {

+	{ "LOAD_CPL",   mi_cpl_load,     0,  mi_child_init },

+	{ "REMOVE_CPL", mi_cpl_remove,   0,  0             },

+	{ "GET_CPL",    mi_cpl_get,      0,  0             },

+	{ 0, 0, 0, 0}

+};

+

+

+

+

 struct module_exports exports = {

 	"cpl-c",

 	cmds,     /* Exported functions */

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

+	mi_cmds,  /* exported MI functions */

 	cpl_init, /* Module initialization function */

 	(response_function) 0,

 	(destroy_function) cpl_exit,

@@ -347,20 +362,6 @@ static int cpl_init(void)

 		goto error;

 	}

-	/* register MI commands */

-	if (register_mi_cmd( mi_cpl_load, "LOAD_CPL", 0)!=0) {

-		LOG(L_ERR,"ERROR:cpl_init: failed to register MI command\n");

-		goto error;

-	}

-	if (register_mi_cmd( mi_cpl_load, "REMOVE_CPL", 0)!=0) {

-		LOG(L_ERR,"ERROR:cpl_init: failed to register MI command\n");

-		goto error;

-	}

-	if (register_mi_cmd( mi_cpl_load, "GET_CPL", 0)!=0) {

-		LOG(L_ERR,"ERROR:cpl_init: failed to register MI command\n");

-		goto error;

-	}

-

 	/* build a pipe for sending commands to aux process */

 	if ( pipe( cpl_env.cmd_pipe )==-1 ) {

 		LOG(L_CRIT,"ERROR:cpl_init: cannot create command pipe: %s!\n",

@@ -414,8 +415,8 @@ static int cpl_child_init(int rank)

 {

 	pid_t pid;

-	/* don't do anything for main process and TCP manager process */

-	if (rank==PROC_MAIN || rank==PROC_TCP_MAIN)

+	/* don't do anything for non-worker process */

+	if (rank<1 && rank!=PROC_FIFO)

 		return 0;

 	/* only child 1 will fork the aux process */

@@ -442,6 +443,11 @@ error:

 }

+static int mi_child_init()

+{

+	return cpl_db_init(DB_URL, DB_TABLE);

+}

+

 static int cpl_exit(void)

 {

@@ -71,7 +71,8 @@ struct module_exports exports = {

 	"dbtext",

 	cmds,     /* Exported functions */

 	params,   /* Exported parameters */

-	0,          /* exported statistics */

+	0,        /* exported statistics */

+	0,        /* exported MI functions */

 	mod_init, /* module initialization function */

 	0,        /* response function*/

 	destroy,  /* destroy function */

@@ -100,12 +100,18 @@ static stat_export_t mod_stats[] = {

 };

+static mi_export_t mi_cmds[] = {

+	{ "dlg_list",  mi_print_dlgs,   0,  0},

+	{ 0, 0, 0, 0}

+};

+

 struct module_exports exports= {

 	"dialog",        /* module's name */

 	cmds,            /* exported functions */

 	mod_params,      /* param exports */

 	mod_stats,       /* exported statistics */

+	mi_cmds,         /* exported MI functions */

 	mod_init,        /* module initialization function */

 	0,               /* reply processing function */

 	mod_destroy,

@@ -257,11 +263,6 @@ static int mod_init(void)

 		return -1;

 	}

-	if ( register_mi_cmd( mi_print_dlgs, "dlg_list",0)<0 ) {

-		LOG(L_ERR,"ERROR:dialog:mod_init: failed to register MI\n");

-		return -1;

-	}

-

 	if(xl_add_extra("dlg_count", it_get_dlg_count, 100, 0 )!=0) {

 		LOG(L_ERR,"ERROR:dialog:mod_init: failed to register pvar "

 			"[dlg_no]\n");

@@ -99,12 +99,20 @@ static param_export_t params[]={

 };

+static mi_export_t mi_cmds[] = {

+	{ "ds_set_state",   ds_mi_set,   0,  0 },

+	{ "ds_list",        ds_mi_list,  0,  0 },

+	{ 0, 0, 0, 0}

+};

+

+

 /** module exports */

 struct module_exports exports= {

 	"dispatcher",

 	cmds,

 	params,

 	0,          /* exported statistics */

+	mi_cmds,    /* exported MI functions */

 	mod_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) destroy,

@@ -132,20 +140,6 @@ static int mod_init(void)

 		return -1;

 	}

-	if(register_mi_cmd(ds_mi_set, "ds_set_state", 0)<0)

-	{

-		LOG(L_ERR,

-			"DISPATCHER:mod_init:ERROR: cannot register MI command!\n");

-		return -1;

-	}

-	

-	if(register_mi_cmd(ds_mi_list, "ds_list", 0)<0)

-	{

-		LOG(L_ERR,

-			"DISPATCHER:mod_init:ERROR: cannot register MI command!!\n");

-		return -1;

-	}

-

 	if(ds_load_list(dslistfile)!=0)

 	{

 		LOG(L_ERR, "DISPATCHER:mod_init:ERROR -- couldn't load list file\n");

@@ -83,6 +83,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -52,6 +52,7 @@

 static int mod_init(void);

 static void destroy(void);

 static int child_init(int rank);

+static int mi_child_init();

 static int parameter_fixup(void** param, int param_no);

 MODULE_VERSION

@@ -111,6 +112,16 @@ static param_export_t params[] = {

 };

+/*

+ * Exported MI functions

+ */

+static mi_export_t mi_cmds[] = {

+	{ MI_DOMAIN_RELOAD,   mi_domain_reload,   0,  mi_child_init },

+	{ MI_DOMAIN_DUMP,     mi_domain_dump,     0,  0 },

+	{ 0, 0, 0, 0}

+};

+

+

 /*

  * Module interface

  */

@@ -119,6 +130,7 @@ struct module_exports exports = {

 	cmds,      /* Exported functions */

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

+	mi_cmds,   /* exported MI functions */

 	mod_init,  /* module initialization function */

 	0,         /* response function*/

 	destroy,   /* destroy function */

@@ -157,9 +169,6 @@ static int mod_init(void)

 		/* Initialize fifo interface */

 		(void)init_domain_fifo();

-		/* Initialize MI interface */

-		(void)init_domain_mi();

-

 		if (init_domain_unixsock() < 0) {

 			LOG(L_ERR, "ERROR: domain:mod_init(): error while initializing"

 					" unix socket interface\n");

@@ -220,6 +229,12 @@ static int child_init(int rank)

 }

+static int mi_child_init()

+{

+	return domain_db_init(db_url.s);

+}

+

+

 static void destroy(void)

 {

 	/* Destroy is called from the main process only,

@@ -29,7 +29,6 @@

 #include "../../dprint.h"

 #include "../../db/db.h"

-#include "../../mi/mi.h"

 #include "domain_mod.h"

 #include "domain.h"

 #include "hash.h"

@@ -39,7 +38,7 @@

 /*

  * MI function to reload domain table

  */

-static struct mi_node* mi_domain_reload(struct mi_node *cmd, void *param)

+struct mi_node* mi_domain_reload(struct mi_node *cmd, void *param)

 {

 	if (reload_domain_table () == 1) {

 		return init_mi_tree(MI_200_OK_S, MI_200_OK_LEN);

@@ -52,7 +51,7 @@ static struct mi_node* mi_domain_reload(struct mi_node *cmd, void *param)

 /*

  * MI function to print domains from current hash table

  */

-static struct mi_node* mi_domain_dump(struct mi_node *cmd, void *param)

+struct mi_node* mi_domain_dump(struct mi_node *cmd, void *param)

 {

 	struct mi_node* rpl;

@@ -69,22 +68,3 @@ static struct mi_node* mi_domain_dump(struct mi_node *cmd, void *param)

 	return rpl;

 }

-

-

-/*

- * Register domain MI functions

- */

-int init_domain_mi( void )

-{

-	if (register_mi_cmd(mi_domain_reload, MI_DOMAIN_RELOAD, 0) < 0) {

-		LOG(L_CRIT, "Cannot register %s\n",MI_DOMAIN_RELOAD);

-		return -1;

-	}

-

-	if (register_mi_cmd(mi_domain_dump, MI_DOMAIN_DUMP, 0) < 0) {

-		LOG(L_CRIT, "Cannot register %s\n",MI_DOMAIN_DUMP);

-		return -1;

-	}

-

-	return 1;

-}

@@ -26,9 +26,15 @@

 #ifndef _DOMAIN_MI_H_

 #define _DOMAIN_MI_H_

+#include "../../mi/mi.h"

+

 #define MI_DOMAIN_RELOAD "domain_reload"

 #define MI_DOMAIN_DUMP "domain_dump"

-int init_domain_mi( void );

+

+struct mi_node* mi_domain_reload(struct mi_node *cmd, void *param);

+

+struct mi_node* mi_domain_dump(struct mi_node *cmd, void *param);

+

 #endif

@@ -101,6 +101,7 @@ struct module_exports exports = {

 	cmds,     /* Exported functions */

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

+	0,        /* exported MI functions */

 	mod_init, /* module initialization function */

 	0,        /* response function*/

 	0,        /* destroy function */

@@ -83,6 +83,7 @@ struct module_exports exports= {

 	cmds,           /* Exported functions */

 	params,         /* Exported parameters */

 	0,              /* exported statistics */

+	0,              /* exported MI functions */

 	mod_init, 	/* initialization module */

 	0,		/* response function */

 	exec_shutdown,	/* destroy function */

new file mode 100644

@@ -0,0 +1,40 @@

+/* 

+ * $Id$ 

+ *

+ * Flatstore module MI interface

+ *

+ * Copyright (C) 2006 Voice Sistem SRL

+ *

+ * This file is part of openser, a free SIP server.

+ *

+ * openser is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version

+ *

+ * openser is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License 

+ * along with this program; if not, write to the Free Software 

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ */

+

+#include "flatstore_mod.h"

+#include "flat_mi.h"

+

+

+struct mi_node*  mi_flat_rotate_cmd(struct mi_node* cmd, void* param)

+{

+	struct mi_node *rpl;

+

+	rpl = init_mi_tree(MI_200_OK_S, MI_200_OK_LEN);

+	if(rpl == NULL)

+		return rpl;

+

+	*flat_rotate = time(0);

+

+	return rpl;

+}

new file mode 100644

@@ -0,0 +1,35 @@

+/* 

+ * $Id$ 

+ *

+ * Flatstore module MI interface

+ *

+ * Copyright (C) 2006 Voice Sistem RL

+ *

+ * This file is part of openser, a free SIP server.

+ *

+ * openser is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version

+ *

+ * openser is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License 

+ * along with this program; if not, write to the Free Software 

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ */

+

+#ifndef _FLATSTORE_MI_H_

+#define _FLATSTORE_MI_H_

+

+#include "../../mi/mi.h"

+

+#define MI_FLAT_ROTATE "flat_rotate"

+

+struct mi_node*  mi_flat_rotate_cmd(struct mi_node* cmd, void* param);

+

+#endif /* _FLATSTORE_MI_H_ */

+

@@ -31,6 +31,7 @@

 #include "../../mem/shm_mem.h"

 #include "flatstore.h"

 #include "flat_fifo.h"

+#include "flat_mi.h"

 #include "flatstore_mod.h"

 MODULE_VERSION

@@ -63,7 +64,7 @@ char* flat_delimiter = "|";

  * Timestamp of the last log rotation request from

  * the FIFO interface

  */

-time_t* flat_rotate;	

+time_t* flat_rotate;

 time_t local_timestamp;

@@ -88,11 +89,20 @@ static param_export_t params[] = {

 };

-struct module_exports exports = {	

+/*

+ * Exported parameters

+ */

+static mi_export_t mi_cmds[] = {

+	{ MI_FLAT_ROTATE, mi_flat_rotate_cmd,   0,  0 },

+	{ 0, 0, 0, 0}

+};

+

+struct module_exports exports = {

 	"flatstore",

 	cmds,

 	params,      /*  module parameters */

 	0,           /* exported statistics */

+	mi_cmds,     /* exported MI functions */

 	mod_init,    /* module initialization function */

 	0,           /* response function*/

 	mod_destroy, /* destroy function */

@@ -68,6 +68,11 @@ static int set_gflag(struct sip_msg*, char *, char *);

 static int reset_gflag(struct sip_msg*, char *, char *);

 static int is_gflag(struct sip_msg*, char *, char *);

+static struct mi_node* mi_set_gflag(struct mi_node* cmd, void* param );

+static struct mi_node* mi_reset_gflag(struct mi_node* cmd, void* param );

+static struct mi_node* mi_is_gflag(struct mi_node* cmd, void* param );

+static struct mi_node* mi_get_gflags(struct mi_node* cmd, void* param );

+

 static int fixup_str2int( void** param, int param_no);

 static int  mod_init(void);

@@ -86,16 +91,25 @@ static cmd_export_t cmds[]={

 	{0, 0, 0, 0, 0}

 };

-static param_export_t params[]={ 

+static param_export_t params[]={

 	{"initial", INT_PARAM, &initial},

 	{0,0,0} 

 };

+static mi_export_t mi_cmds[] = {

+	{ FIFO_SET_GFLAG,   mi_set_gflag,   0,  0 },

+	{ FIFO_RESET_GFLAG, mi_reset_gflag, 0,  0 },

+	{ FIFO_IS_GFLAG,    mi_is_gflag,    0,  0 },

+	{ FIFO_GET_GFLAGS,  mi_get_gflags,  0,  0 },

+	{ 0, 0, 0, 0}

+};

+

 struct module_exports exports = {

 	"gflags",

 	cmds,        /* exported functions */

 	params,      /* exported parameters */

 	0,           /* exported statistics */

+	mi_cmds,     /* exported MI functions */

 	mod_init,    /* module initialization function */

 	0,           /* response function*/

 	mod_destroy, /* destroy function */

@@ -289,7 +303,7 @@ error:

-struct mi_node*  mi_reset_gflag(struct mi_node* cmd, void* param )

+static struct mi_node*  mi_reset_gflag(struct mi_node* cmd, void* param )

 {

 	unsigned int flag;

 	struct mi_node* node = NULL;

@@ -314,7 +328,7 @@ error:

-struct mi_node* mi_is_gflag(struct mi_node* cmd, void* param )

+static struct mi_node* mi_is_gflag(struct mi_node* cmd, void* param )

 {

 	unsigned int flag;

 	struct mi_node* rpl= NULL;

@@ -353,7 +367,7 @@ error_param:

 }

-struct mi_node*  mi_get_gflags(struct mi_node* cmd, void* param )

+static struct mi_node*  mi_get_gflags(struct mi_node* cmd, void* param )

 {

 	struct mi_node* rpl= NULL;

 	struct mi_node* node= NULL;

@@ -378,7 +392,6 @@ error:

-

 static int mod_init(void)

 {

 	gflags=(unsigned int *) shm_malloc(sizeof(unsigned int));

@@ -404,23 +417,6 @@ static int mod_init(void)

 		return -1;

 	}

-	if (register_mi_cmd(mi_set_gflag, FIFO_SET_GFLAG, 0) < 0) {

-		LOG(L_CRIT, "Cannot register MI %s\n",FIFO_SET_GFLAG);

-		return -1;

-	}

-	if (register_mi_cmd(mi_reset_gflag, FIFO_RESET_GFLAG, 0) < 0) {

-		LOG(L_CRIT, "Cannot register MI %s\n",FIFO_RESET_GFLAG);

-		return -1;

-	}

-	if (register_mi_cmd(mi_is_gflag, FIFO_IS_GFLAG, 0) < 0) {

-		LOG(L_CRIT, "Cannot register MI %s\n",FIFO_SET_GFLAG);

-		return -1;

-	}

-	if (register_mi_cmd(mi_get_gflags, FIFO_GET_GFLAGS, 0) < 0) {

-		LOG(L_CRIT, "Cannot register MI %s\n",FIFO_SET_GFLAG);

-		return -1;

-	}

-

 	return 0;

 }

@@ -157,6 +157,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -84,6 +84,7 @@ struct module_exports exports = {

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

+	0,          /* exported MI functions */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -91,8 +91,8 @@ static int imc_manager(struct sip_msg*, char *, char *);

 static int imc_list_rooms(FILE *stream, char *response_file);

 static int imc_list_members(FILE *stream, char *response_file);

-struct mi_node* imc_mi_list_rooms(struct mi_node* cmd, void* param);

-struct mi_node* imc_mi_list_members(struct mi_node* cmd, void* param);

+static struct mi_node* imc_mi_list_rooms(struct mi_node* cmd, void* param);

+static struct mi_node* imc_mi_list_members(struct mi_node* cmd, void* param);

 void destroy(void);

 int imc_list_randm(FILE *stream);

@@ -102,7 +102,6 @@ int imc_list_members2(FILE* stream, imc_room_p room);

 struct tm_binds tmb;

 /** TM callback function */

-//static void imc_tm_callback( struct cell *t, int type, struct tmcb_params *ps);

 void inv_callback( struct cell *t, int type, struct tmcb_params *ps);

 static cmd_export_t cmds[]={

@@ -112,7 +111,7 @@ static cmd_export_t cmds[]={

 static param_export_t params[]={

-	{ "db_url",				STR_PARAM, &db_url.s},

+	{"db_url",				STR_PARAM, &db_url.s},

 	{"hash_size",			INT_PARAM, &imc_hash_size},

 	{"imc_cmd_start_char",	STR_PARAM, &imc_cmd_start_str},	

 	{0,0,0}

@@ -130,10 +129,17 @@ stat_export_t imc_stats[] = {

 #endif

+static mi_export_t mi_cmds[] = {

+	{ "imc_list_rooms",    imc_mi_list_rooms,    0,  0 },

+	{ "imc_list_members",  imc_mi_list_members,  0,  0 },

+	{ 0, 0, 0, 0}

+};

+

+

 /** module exports */

 struct module_exports exports= {

-	"imc",		/* module name */

+	"imc",      /* module name */

 	cmds,       /* exported commands */

 	params,     /* exported parameters */

 #ifdef STATISTICS

@@ -141,6 +147,7 @@ struct module_exports exports= {

 #else

 	0,          /* exported statistics */

 #endif

+	mi_cmds,    /* exported MI functions */

 	mod_init,   /* mod init */

 	(response_function) 0,       /* response handler */

 	(destroy_function) destroy,  /* destroy function */

@@ -404,20 +411,6 @@ static int mod_init(void)

 		return -1;

 	}

-	if(register_mi_cmd(imc_mi_list_rooms, "imc_list_rooms", 0)<0)

-	{

-		LOG(L_ERR, "IMC:mod_init: error - unable to register MI cmd" 

-			" 'imc_list_rooms'\n");

-		return -1;

-	}

-

-	if(register_mi_cmd(imc_mi_list_members, "imc_list_members", 0)<0)

-	{

-		LOG(L_ERR,"IMC:mod_init: error - unable to register MI cmd"

-			"'imc_list_members'\n");

-		return -1;

-	}

-

 	if(imc_cmd_start_str)

 		imc_cmd_start_char = imc_cmd_start_str[0];

@@ -1428,7 +1421,7 @@ void destroy(void)

 	}

-	imc_htable_destroy();	

+	imc_htable_destroy();

 }

 int imc_list_randm(FILE *stream)

@@ -1467,7 +1460,8 @@ int imc_list_members2(FILE* stream, imc_room_p room)

 	while(member)

 	{

 		DBG("Member: name= %.*s\ndomain= %.*s\nflag= %d\n",member->user.len,

-				member->user.s, member->domain.len, member->domain.s, member->flags);

+				member->user.s, member->domain.len, member->domain.s,

+				member->flags);

 		member = member->next;

 	}

@@ -1479,9 +1473,7 @@ int imc_list_rooms(FILE *stream, char *response_file){

 	int i;

 	FILE *freply=NULL;

 	imc_room_p irp = NULL;

-	// irp_temp=NULL;

-	

 	freply = open_reply_pipe(response_file);

 	if(freply==NULL)

 	{

@@ -1489,7 +1481,7 @@ int imc_list_rooms(FILE *stream, char *response_file){

 				response_file);

 		return -1;

 	}

-	

+

 	for(i=0; i<imc_hash_size; i++) 

 	{

 		irp = _imc_htable[i].rooms;

@@ -1504,59 +1496,66 @@ int imc_list_rooms(FILE *stream, char *response_file){

 	if(freply!=NULL)

 		fclose(freply);

-	return 0;	

-

+	return 0;

 }

-/************************* MI ***********************/

-struct mi_node* imc_mi_list_rooms(struct mi_node* cmd, void* param){

+

+

+/************************* MI ***********************/

+static struct mi_node* imc_mi_list_rooms(struct mi_node* cmd, void* param)

+{

 	int i, len;

 	struct mi_node* rpl= NULL;

 	struct mi_node* node= NULL;

 	struct mi_attr* attr= NULL;

 	imc_room_p irp = NULL;

 	char* p = NULL;

-	// irp_temp=NULL;

-	

+

 	rpl= init_mi_tree(MI_200_OK_S, MI_200_OK_LEN);

 	if(rpl == NULL)

 		return 0;

 	for(i=0; i<imc_hash_size; i++) 

 	{

+		lock_get(&_imc_htable[i].lock);

 		irp = _imc_htable[i].rooms;

 			while(irp){

 				node = add_mi_node_child(rpl, 0, "ROOM", 4, 0, 0);

 				if( node == NULL)

 					goto error;

-				attr= add_mi_attr(node, 0, "URI", 3, irp->uri.s, irp->uri.len);

+				attr= add_mi_attr(node, MI_DUP_VALUE, "URI", 3, irp->uri.s,

+					irp->uri.len);

 				if(attr == NULL)

 					goto error;

-				p = int2str(irp->nr_of_members, &len);	

+				p = int2str(irp->nr_of_members, &len);

 				attr= add_mi_attr(node, 0, "MEMBERS", 7,p, len );

 				if(attr == NULL)

 					goto error;

-				attr= add_mi_attr(node, 0, "OWNER", 5, irp->uri.s, irp->uri.len);

+				attr= add_mi_attr(node, MI_DUP_VALUE, "OWNER", 5, irp->uri.s,

+					irp->uri.len);

 				if(attr == NULL)

 					goto error;

 				irp = irp->next;

 			}

+		lock_release(&_imc_htable[i].lock);

 	}

-		

+

 	return rpl;

 error:

+	lock_release(&_imc_htable[i].lock);

 	free_mi_tree(rpl);

 	return 0;

 }

-struct mi_node* imc_mi_list_members(struct mi_node* cmd, void* param){

-	

+

+static struct mi_node* imc_mi_list_members(struct mi_node* cmd, void* param)

+{

 	int i, len;

 	struct mi_node* rpl = NULL;

 	struct mi_node* node= NULL;

@@ -1567,7 +1566,6 @@ struct mi_node* imc_mi_list_members(struct mi_node* cmd, void* param){

 	imc_room_p room;