@@ -163,18 +163,18 @@ static int free_acc_fixup(void** param, int param_no);

 static cmd_export_t cmds[] = {

-	{"acc_log_request", w_acc_log_request, 1, acc_fixup, free_acc_fixup,

+	{"acc_log_request", (cmd_function)w_acc_log_request, 1, acc_fixup, free_acc_fixup,

 			REQUEST_ROUTE|FAILURE_ROUTE},

 #ifdef SQL_ACC

-	{"acc_db_request",  w_acc_db_request,  2, acc_fixup, free_acc_fixup,

+	{"acc_db_request",  (cmd_function)w_acc_db_request,  2, acc_fixup, free_acc_fixup,

 			REQUEST_ROUTE|FAILURE_ROUTE},

 #endif

 #ifdef RAD_ACC

-	{"acc_rad_request", w_acc_rad_request, 1, acc_fixup, free_acc_fixup,

+	{"acc_rad_request", (cmd_function)w_acc_rad_request, 1, acc_fixup, free_acc_fixup,

 			REQUEST_ROUTE|FAILURE_ROUTE},

 #endif

 #ifdef DIAM_ACC

-	{"acc_diam_request",w_acc_diam_request,1, acc_fixup, free_acc_fixup,

+	{"acc_diam_request",(cmd_function)w_acc_diam_request,1, acc_fixup, free_acc_fixup,

 			REQUEST_ROUTE|FAILURE_ROUTE},

 #endif

 	{0, 0, 0, 0, 0, 0}

@@ -69,7 +69,7 @@ db_func_t adbf;  /* DB functions */

 /* Exported functions */

 static cmd_export_t cmds[] = {

-	{"alias_db_lookup", alias_db_lookup, 1, 0, 0,

+	{"alias_db_lookup", (cmd_function)alias_db_lookup, 1, 0, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -122,21 +122,21 @@ static pv_spec_t passwd_spec;

  * Exported functions 

  */

 static cmd_export_t cmds[] = {

-	{"www_challenge",       www_challenge,           2, challenge_fixup,

+	{"www_challenge",       (cmd_function)www_challenge,           2, challenge_fixup,

 			0, REQUEST_ROUTE},

-	{"proxy_challenge",     proxy_challenge,         2, challenge_fixup,

+	{"proxy_challenge",     (cmd_function)proxy_challenge,         2, challenge_fixup,

 			0, REQUEST_ROUTE},

-	{"pv_www_authorize",    pv_www_authorize,        1, auth_fixup,

+	{"pv_www_authorize",    (cmd_function)pv_www_authorize,        1, auth_fixup,

 			0, REQUEST_ROUTE},

-	{"pv_proxy_authorize",  pv_proxy_authorize,      1, auth_fixup,

+	{"pv_proxy_authorize",  (cmd_function)pv_proxy_authorize,      1, auth_fixup,

 			0, REQUEST_ROUTE},

-	{"consume_credentials", consume_credentials,     0, 0,

+	{"consume_credentials", (cmd_function)consume_credentials,     0, 0,

 			0, REQUEST_ROUTE},

-	{"is_rpid_user_e164",   is_rpid_user_e164,       0, 0,

+	{"is_rpid_user_e164",   (cmd_function)is_rpid_user_e164,       0, 0,

 			0, REQUEST_ROUTE},

-	{"append_rpid_hf",      append_rpid_hf,          0, 0,

+	{"append_rpid_hf",      (cmd_function)append_rpid_hf,          0, 0,

 			0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"append_rpid_hf",      append_rpid_hf_p,        2, rpid_fixup,

+	{"append_rpid_hf",      (cmd_function)append_rpid_hf_p,        2, rpid_fixup,

 			0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

 	{"bind_auth",           (cmd_function)bind_auth, 0, 0,

 			0, 0},

@@ -113,8 +113,8 @@ int credentials_n           = 0; /* Number of credentials in the list */

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"www_authorize",   www_authorize,   2, auth_fixup, 0, REQUEST_ROUTE},

-	{"proxy_authorize", proxy_authorize, 2, auth_fixup, 0, REQUEST_ROUTE},

+	{"www_authorize",   (cmd_function)www_authorize,   2, auth_fixup, 0, REQUEST_ROUTE},

+	{"proxy_authorize", (cmd_function)proxy_authorize, 2, auth_fixup, 0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -76,11 +76,11 @@ rd_buf_t *rb;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"diameter_www_authorize",   diameter_www_authorize,   1, auth_fixup,

+	{"diameter_www_authorize",   (cmd_function)diameter_www_authorize,   1, auth_fixup,

 			0, REQUEST_ROUTE},

-	{"diameter_proxy_authorize", diameter_proxy_authorize, 1, auth_fixup,

+	{"diameter_proxy_authorize", (cmd_function)diameter_proxy_authorize, 1, auth_fixup,

 			0, REQUEST_ROUTE},

-	{"diameter_is_user_in",      diameter_is_user_in,      2, group_fixup,

+	{"diameter_is_user_in",      (cmd_function)diameter_is_user_in,      2, group_fixup,

 			0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -91,31 +91,31 @@ static int w_is_avp_set(struct sip_msg* msg, char* param, char *foo);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"avp_print",  w_print_avps, 0, 0, 0,

+	{"avp_print", (cmd_function)w_print_avps, 0, 0, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_db_load",   w_dbload_avps,  2, fixup_db_load_avp, 0,

+	{"avp_db_load", (cmd_function)w_dbload_avps,  2, fixup_db_load_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_db_delete", w_dbdelete_avps, 2, fixup_db_delete_avp, 0,

+	{"avp_db_delete", (cmd_function)w_dbdelete_avps, 2, fixup_db_delete_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_db_store",  w_dbstore_avps,  2, fixup_db_store_avp, 0,

+	{"avp_db_store", (cmd_function)w_dbstore_avps,  2, fixup_db_store_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_db_query",  w_dbquery1_avps, 1, fixup_db_query_avp, 0,

+	{"avp_db_query", (cmd_function)w_dbquery1_avps, 1, fixup_db_query_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_db_query",  w_dbquery2_avps, 2, fixup_db_query_avp, 0,

+	{"avp_db_query", (cmd_function)w_dbquery2_avps, 2, fixup_db_query_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_delete", w_delete_avps, 1, fixup_delete_avp, 0,

+	{"avp_delete", (cmd_function)w_delete_avps, 1, fixup_delete_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_copy",   w_copy_avps,  2,  fixup_copy_avp, 0,

+	{"avp_copy",   (cmd_function)w_copy_avps,  2,  fixup_copy_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_pushto", w_pushto_avps, 2, fixup_pushto_avp, 0,

+	{"avp_pushto", (cmd_function)w_pushto_avps, 2, fixup_pushto_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_check",  w_check_avps, 2, fixup_check_avp, 0,

+	{"avp_check",  (cmd_function)w_check_avps, 2, fixup_check_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_op",     w_op_avps, 2, fixup_op_avp, 0,

+	{"avp_op",     (cmd_function)w_op_avps, 2, fixup_op_avp, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"avp_subst",  w_subst,   2, fixup_subst, 0,

+	{"avp_subst",  (cmd_function)w_subst,   2, fixup_subst, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

-	{"is_avp_set", w_is_avp_set, 1, fixup_is_avp_set, 0,

+	{"is_avp_set", (cmd_function)w_is_avp_set, 1, fixup_is_avp_set, 0,

 					REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -99,11 +99,11 @@ static inline int fixup_bm_timer(void** param, int param_no);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{ "bm_start_timer", bm_start_timer, 1, fixup_bm_timer, 0,

+	{ "bm_start_timer", (cmd_function)bm_start_timer, 1, fixup_bm_timer, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{ "bm_log_timer",   bm_log_timer, 1, fixup_bm_timer, 0,

+	{ "bm_log_timer",   (cmd_function)bm_log_timer, 1, fixup_bm_timer, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"load_bm", (cmd_function)load_bm, 0, 0, 0, 0},

+	{"load_bm",         (cmd_function)load_bm, 0, 0, 0, 0},

 	{ 0, 0, 0, 0, 0, 0 }

 };

@@ -105,14 +105,14 @@ static enum hash_source hash_fixup(const char * domain);

 /************* Module Exports **********************************************/

 static cmd_export_t cmds[]={

-	{"cr_rewrite_uri",           route_uri,             2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_prime_balance_uri",     prime_balance_uri,     2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_rewrite_by_to",         route_by_to,           2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_prime_balance_by_to",   prime_balance_by_to,   2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_rewrite_by_from",       route_by_from,         2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_prime_balance_by_from", prime_balance_by_from, 2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_user_rewrite_uri",      user_route_uri,        2, user_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"cr_tree_rewrite_uri",      tree_route_uri,        2, tree_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_rewrite_uri",           (cmd_function)route_uri,             2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_prime_balance_uri",     (cmd_function)prime_balance_uri,     2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_rewrite_by_to",         (cmd_function)route_by_to,           2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_prime_balance_by_to",   (cmd_function)prime_balance_by_to,   2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_rewrite_by_from",       (cmd_function)route_by_from,         2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_prime_balance_by_from", (cmd_function)prime_balance_by_from, 2, route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_user_rewrite_uri",      (cmd_function)user_route_uri,        2, user_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

+	{"cr_tree_rewrite_uri",      (cmd_function)tree_route_uri,        2, tree_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE },

 	{0, 0, 0, 0, 0, 0}

 };

@@ -81,20 +81,20 @@ static int *probability;

 static cmd_export_t cmds[]={

 	{"rand_set_prob", /* action name as in scripts */

-		set_prob,  /* C function name */

+		(cmd_function)set_prob,  /* C function name */

 		1,          /* number of parameters */

 		fixup_prob, 0,         /* */

 		/* can be applied to original/failed requests and replies */

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, 

-	{"rand_reset_prob", reset_prob, 0, 0, 0,

+	{"rand_reset_prob", (cmd_function)reset_prob, 0, 0, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, 

-	{"rand_get_prob", get_prob, 0, 0, 0,

+	{"rand_get_prob", (cmd_function)get_prob, 0, 0, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"rand_event", rand_event, 0, 0, 0,

+	{"rand_event", (cmd_function)rand_event, 0, 0, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"sleep",    m_sleep,    1,      fixup_str2int, 0, 

+	{"sleep",    (cmd_function)m_sleep,    1,      fixup_str2int, 0, 

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"usleep",   m_usleep,   1,      fixup_str2int, 0,

+	{"usleep",   (cmd_function)m_usleep,   1,      fixup_str2int, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -111,14 +111,14 @@ struct mi_root* ds_mi_reload(struct mi_root* cmd_tree, void* param);

 static int mi_child_init(void);

 static cmd_export_t cmds[]={

-	{"ds_select_dst",    w_ds_select_dst,    2, ds_fixup, 0, REQUEST_ROUTE},

-	{"ds_select_domain", w_ds_select_domain, 2, ds_fixup, 0, REQUEST_ROUTE},

-	{"ds_next_dst",      w_ds_next_dst,      0, ds_warn_fixup, 0, FAILURE_ROUTE},

-	{"ds_next_domain",   w_ds_next_domain,   0, ds_warn_fixup, 0, FAILURE_ROUTE},

-	{"ds_mark_dst",      w_ds_mark_dst0,     0, ds_warn_fixup, 0, FAILURE_ROUTE},

-	{"ds_mark_dst",      w_ds_mark_dst1,     1, ds_warn_fixup, 0, FAILURE_ROUTE},

-	{"ds_is_from_list",  w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"ds_is_from_list",  w_ds_is_from_list1, 1, fixup_str2int, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

+	{"ds_select_dst",    (cmd_function)w_ds_select_dst,    2, ds_fixup, 0, REQUEST_ROUTE},

+	{"ds_select_domain", (cmd_function)w_ds_select_domain, 2, ds_fixup, 0, REQUEST_ROUTE},

+	{"ds_next_dst",      (cmd_function)w_ds_next_dst,      0, ds_warn_fixup, 0, FAILURE_ROUTE},

+	{"ds_next_domain",   (cmd_function)w_ds_next_domain,   0, ds_warn_fixup, 0, FAILURE_ROUTE},

+	{"ds_mark_dst",      (cmd_function)w_ds_mark_dst0,     0, ds_warn_fixup, 0, FAILURE_ROUTE},

+	{"ds_mark_dst",      (cmd_function)w_ds_mark_dst1,     1, ds_warn_fixup, 0, FAILURE_ROUTE},

+	{"ds_is_from_list",  (cmd_function)w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

+	{"ds_is_from_list",  (cmd_function)w_ds_is_from_list1, 1, fixup_str2int, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -60,7 +60,7 @@ static int mod_init(void);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"add_diversion",    add_diversion,    1, str_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE},

+	{"add_diversion",    (cmd_function)add_diversion,    1, str_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -88,11 +88,11 @@ struct domain_list **hash_table_2 = 0;	/* Pointer to hash table 2 */

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"is_from_local",       is_from_local,       0,  0, 0,

+	{"is_from_local",       (cmd_function)is_from_local,       0,  0, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"is_uri_host_local",   is_uri_host_local,   0,  0, 0,

+	{"is_uri_host_local",   (cmd_function)is_uri_host_local,   0,  0, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"is_domain_local",     w_is_domain_local,   1,  parameter_fixup, 0,

+	{"is_domain_local",     (cmd_function)w_is_domain_local,   1,  parameter_fixup, 0,

 			REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -104,8 +104,8 @@ unsigned short send_socket_avp_name_str;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"dp_can_connect",  dp_can_connect,  0, 0, 0, REQUEST_ROUTE},

-	{"dp_apply_policy", dp_apply_policy, 0, 0, 0, REQUEST_ROUTE},

+	{"dp_can_connect",  (cmd_function)dp_can_connect,  0, 0, 0, REQUEST_ROUTE},

+	{"dp_apply_policy", (cmd_function)dp_apply_policy, 0, 0, 0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -78,18 +78,18 @@ str i_bl_alg;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"enum_query",        enum_query_0,     0, 0,            0, REQUEST_ROUTE},

-	{"enum_query",        enum_query_1,     1, str_fixup,    0, REQUEST_ROUTE},

-	{"enum_query",        enum_query_2,     2, enum_fixup,   0, REQUEST_ROUTE},

-	{"enum_fquery",       enum_fquery_0,    0, 0,            0, REQUEST_ROUTE},

-	{"enum_fquery",       enum_fquery_1,    1, str_fixup,    0, REQUEST_ROUTE},

-	{"enum_fquery",       enum_fquery_2,    2, enum_fixup,   0, REQUEST_ROUTE},

-	{"is_from_user_enum", is_from_user_enum_0, 0, 0,         0, REQUEST_ROUTE},

-	{"is_from_user_enum", is_from_user_enum_1, 1, str_fixup, 0, REQUEST_ROUTE},

-	{"is_from_user_enum", is_from_user_enum_2, 2, enum_fixup,0, REQUEST_ROUTE},

-	{"i_enum_query",      i_enum_query_0,   0, 0,            0, REQUEST_ROUTE},

-	{"i_enum_query",      i_enum_query_1,   1, str_fixup,    0, REQUEST_ROUTE},

-	{"i_enum_query",      i_enum_query_2,   2, enum_fixup,   0, REQUEST_ROUTE},

+	{"enum_query",        (cmd_function)enum_query_0,     0, 0,            0, REQUEST_ROUTE},

+	{"enum_query",        (cmd_function)enum_query_1,     1, str_fixup,    0, REQUEST_ROUTE},

+	{"enum_query",        (cmd_function)enum_query_2,     2, enum_fixup,   0, REQUEST_ROUTE},

+	{"enum_fquery",       (cmd_function)enum_fquery_0,    0, 0,            0, REQUEST_ROUTE},

+	{"enum_fquery",       (cmd_function)enum_fquery_1,    1, str_fixup,    0, REQUEST_ROUTE},

+	{"enum_fquery",       (cmd_function)enum_fquery_2,    2, enum_fixup,   0, REQUEST_ROUTE},

+	{"is_from_user_enum", (cmd_function)is_from_user_enum_0, 0, 0,         0, REQUEST_ROUTE},

+	{"is_from_user_enum", (cmd_function)is_from_user_enum_1, 1, str_fixup, 0, REQUEST_ROUTE},

+	{"is_from_user_enum", (cmd_function)is_from_user_enum_2, 2, enum_fixup,0, REQUEST_ROUTE},

+	{"i_enum_query",      (cmd_function)i_enum_query_0,   0, 0,            0, REQUEST_ROUTE},

+	{"i_enum_query",      (cmd_function)i_enum_query_1,   1, str_fixup,    0, REQUEST_ROUTE},

+	{"i_enum_query",      (cmd_function)i_enum_query_2,   2, enum_fixup,   0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -60,10 +60,10 @@ inline static void exec_shutdown(void);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"exec_dset", w_exec_dset, 1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

-	{"exec_msg",  w_exec_msg,  1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

-	{"exec_avp",  w_exec_avp,  1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

-	{"exec_avp",  w_exec_avp,  2, exec_avp_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"exec_dset", (cmd_function)w_exec_dset, 1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"exec_msg",  (cmd_function)w_exec_msg,  1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"exec_avp",  (cmd_function)w_exec_avp,  1, it_list_fixup,  0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"exec_avp",  (cmd_function)w_exec_avp,  2, exec_avp_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -81,11 +81,11 @@ static int initial=0;

 static unsigned int *gflags=0;

 static cmd_export_t cmds[]={

-	{"set_gflag",    set_gflag,   1,   fixup_gflags, 0,

+	{"set_gflag",    (cmd_function)set_gflag,   1,   fixup_gflags, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"reset_gflag",  reset_gflag, 1,   fixup_gflags, 0,

+	{"reset_gflag",  (cmd_function)reset_gflag, 1,   fixup_gflags, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

-	{"is_gflag",     is_gflag,    1,   fixup_gflags, 0,

+	{"is_gflag",     (cmd_function)is_gflag,    1,   fixup_gflags, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -123,9 +123,9 @@ db_con_t* group_dbh = 0;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"is_user_in",      is_user_in,      2,  hf_fixup, 0,

+	{"is_user_in",      (cmd_function)is_user_in,      2,  hf_fixup, 0,

 			REQUEST_ROUTE|FAILURE_ROUTE},

-	{"get_user_group",  get_user_group,  2,  get_gid_fixup, 0,

+	{"get_user_group",  (cmd_function)get_user_group,  2,  get_gid_fixup, 0,

 			REQUEST_ROUTE|FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -90,7 +90,7 @@ struct tm_binds tmb;

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

 static cmd_export_t cmds[]={

-	{"imc_manager",  imc_manager, 0, 0, 0, REQUEST_ROUTE},

+	{"imc_manager",  (cmd_function)imc_manager, 0, 0, 0, REQUEST_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -260,25 +260,25 @@ static int pvar_fixup(void** param, int param_no);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"load_gws",      load_gws,      0, 0, 0,

+	{"load_gws",      (cmd_function)load_gws,      0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"load_gws",      load_gws_grp,  1, fixstringloadgws, 0,

+	{"load_gws",      (cmd_function)load_gws_grp,  1, fixstringloadgws, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"next_gw",       next_gw,       0, 0, 0,

+	{"next_gw",       (cmd_function)next_gw,       0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"from_gw",       from_gw_0,       0, 0, 0,

+	{"from_gw",       (cmd_function)from_gw_0,       0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE},

-	{"from_gw",       from_gw_1,       1, pvar_fixup, 0,

+	{"from_gw",       (cmd_function)from_gw_1,       1, pvar_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE},

-	{"from_gw_grp",       from_gw_grp,   1, fixup_str2int, 0,

+	{"from_gw_grp",   (cmd_function)from_gw_grp,   1, fixup_str2int, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE},

-	{"to_gw",         to_gw,         0, 0, 0,

+	{"to_gw",         (cmd_function)to_gw,         0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"to_gw",         to_gw_grp,     1, fixup_str2int, 0,

+	{"to_gw",         (cmd_function)to_gw_grp,     1, fixup_str2int, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"load_contacts", load_contacts, 0, 0, 0,

+	{"load_contacts", (cmd_function)load_contacts, 0, 0, 0,

 		REQUEST_ROUTE},

-	{"next_contacts", next_contacts, 0, 0, 0,

+	{"next_contacts", (cmd_function)next_contacts, 0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

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

  */

 static cmd_export_t cmds[] = 

 {

-	{"sdp_mangle_ip", sdp_mangle_ip, 2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, // fixup_char2str?

-	{"sdp_mangle_port",sdp_mangle_port, 1,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE},// fixup_char2int if I use an int as offset

-	{"encode_contact",encode_contact,2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE},//fixup_char2str

-	{"decode_contact",decode_contact,0,0, 0, REQUEST_ROUTE},

-	{"decode_contact_header",decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE},

+	{"sdp_mangle_ip",   (cmd_function)sdp_mangle_ip, 2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, // fixup_char2str?

+	{"sdp_mangle_port", (cmd_function)sdp_mangle_port, 1,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE},// fixup_char2int if I use an int as offset

+	{"encode_contact",  (cmd_function)encode_contact,2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE},//fixup_char2str

+	{"decode_contact",  (cmd_function)decode_contact,0,0, 0, REQUEST_ROUTE},

+	{"decode_contact_header", (cmd_function)decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -58,9 +58,9 @@ static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo);

 static int mod_init(void);

 static cmd_export_t cmds[]={

-	{"mf_process_maxfwd_header", w_process_maxfwd_header, 1,

+	{"mf_process_maxfwd_header", (cmd_function)w_process_maxfwd_header, 1,

 		fixup_maxfwd_header, 0, REQUEST_ROUTE},

-	{"is_maxfwd_lt", is_maxfwd_lt, 1,

+	{"is_maxfwd_lt", (cmd_function)is_maxfwd_lt, 1,

 		fixup_maxfwd_header, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -198,10 +198,10 @@ NatTest natTests[] = {

 };

 static cmd_export_t commands[] = {

-    {"fix_contact",       FixContact,      0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-    {"use_media_proxy",   UseMediaProxy,   0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-    {"end_media_session", EndMediaSession, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-    {"client_nat_test",   ClientNatTest,   1, fixup_str2int, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

+    {"fix_contact",       (cmd_function)FixContact,      0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

+    {"use_media_proxy",   (cmd_function)UseMediaProxy,   0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

+    {"end_media_session", (cmd_function)EndMediaSession, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

+    {"client_nat_test",   (cmd_function)ClientNatTest,   1, fixup_str2int, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

     {0, 0, 0, 0, 0, 0}

 };

@@ -176,10 +176,10 @@ int check_message_support(struct sip_msg* msg);

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

 static cmd_export_t cmds[]={

-	{"m_store",  m_store, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE},

-	{"m_store",  m_store, 1, fixup_msilo, 0, REQUEST_ROUTE | FAILURE_ROUTE},

-	{"m_dump",   m_dump,  0, 0, 0, REQUEST_ROUTE},

-	{"m_dump",   m_dump,  1, fixup_msilo, 0, REQUEST_ROUTE},

+	{"m_store",  (cmd_function)m_store, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE},

+	{"m_store",  (cmd_function)m_store, 1, fixup_msilo, 0, REQUEST_ROUTE | FAILURE_ROUTE},

+	{"m_dump",   (cmd_function)m_dump,  0, 0, 0, REQUEST_ROUTE},

+	{"m_dump",   (cmd_function)m_dump,  1, fixup_msilo, 0, REQUEST_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -383,31 +383,31 @@ static int *rtpp_socks = 0;

 unsigned int *natping_state=0;

 static cmd_export_t cmds[] = {

-	{"fix_nated_contact",  fix_nated_contact_f,    0, 0, 0,

+	{"fix_nated_contact",  (cmd_function)fix_nated_contact_f,    0, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE},

-	{"fix_nated_sdp",      fix_nated_sdp_f,        1, fixup_fix_sdp, 0,

+	{"fix_nated_sdp",      (cmd_function)fix_nated_sdp_f,        1, fixup_fix_sdp, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"fix_nated_sdp",      fix_nated_sdp_f,        2, fixup_fix_sdp, 0,

+	{"fix_nated_sdp",      (cmd_function)fix_nated_sdp_f,        2, fixup_fix_sdp, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"set_rtp_proxy_set",  set_rtp_proxy_set_f,    1, fixup_set_id, 0,

+	{"set_rtp_proxy_set",  (cmd_function)set_rtp_proxy_set_f,    1, fixup_set_id, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"unforce_rtp_proxy",  unforce_rtp_proxy_f,    0, 0, 0,

+	{"unforce_rtp_proxy",  (cmd_function)unforce_rtp_proxy_f,    0, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"force_rtp_proxy",    force_rtp_proxy0_f,     0, 0, 0,

+	{"force_rtp_proxy",    (cmd_function)force_rtp_proxy0_f,     0, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"force_rtp_proxy",    force_rtp_proxy1_f,     1, 0, 0,

+	{"force_rtp_proxy",    (cmd_function)force_rtp_proxy1_f,     1, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"force_rtp_proxy",    force_rtp_proxy2_f,     2, 0, 0,

+	{"force_rtp_proxy",    (cmd_function)force_rtp_proxy2_f,     2, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"nat_uac_test",       nat_uac_test_f,         1, fixup_str2int, 0,

+	{"nat_uac_test",       (cmd_function)nat_uac_test_f,         1, fixup_str2int, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

-	{"fix_nated_register", fix_nated_register_f,   0, fixup_fix_nated_register, 0,

+	{"fix_nated_register", (cmd_function)fix_nated_register_f,   0, fixup_fix_nated_register, 0,

 			REQUEST_ROUTE },

-	{"add_rcv_param",      add_rcv_param_f,        0, 0, 0,

+	{"add_rcv_param",      (cmd_function)add_rcv_param_f,        0, 0, 0,

 			REQUEST_ROUTE },

-	{"add_rcv_param",      add_rcv_param_f,        1, fixup_str2int, 0,

+	{"add_rcv_param",      (cmd_function)add_rcv_param_f,        1, fixup_str2int, 0,

 			REQUEST_ROUTE },

-	{"start_recording",    start_recording_f,      0, 0, 0,

+	{"start_recording",    (cmd_function)start_recording_f,      0, 0, 0,

 			REQUEST_ROUTE | ONREPLY_ROUTE },

 	{0, 0, 0, 0, 0, 0}

 };

@@ -68,10 +68,10 @@ struct rr_binds path_rrb;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{ "add_path",          add_path,              0,  0,         0, REQUEST_ROUTE },

-	{ "add_path",          add_path_usr,          1,  str_fixup, 0, REQUEST_ROUTE },

-	{ "add_path_received", add_path_received,     0,  0,         0, REQUEST_ROUTE },

-	{ "add_path_received", add_path_received_usr, 1,  str_fixup, 0, REQUEST_ROUTE },

+	{ "add_path",          (cmd_function)add_path,              0,  0,         0, REQUEST_ROUTE },

+	{ "add_path",          (cmd_function)add_path_usr,          1,  str_fixup, 0, REQUEST_ROUTE },

+	{ "add_path_received", (cmd_function)add_path_received,     0,  0,         0, REQUEST_ROUTE },

+	{ "add_path_received", (cmd_function)add_path_received_usr, 1,  str_fixup, 0, REQUEST_ROUTE },

 	{ 0, 0, 0, 0, 0, 0 }

 };

@@ -107,9 +107,9 @@ int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode);

 int pdt_load_db();

 static cmd_export_t cmds[]={

-	{"prefix2domain", w_prefix2domain,   0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

-	{"prefix2domain", w_prefix2domain_1, 1, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

-	{"prefix2domain", w_prefix2domain_2, 2, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"prefix2domain", (cmd_function)w_prefix2domain,   0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"prefix2domain", (cmd_function)w_prefix2domain_1, 1, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

+	{"prefix2domain", (cmd_function)w_prefix2domain_2, 2, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -127,27 +127,27 @@ static int mi_addr_child_init();

 /* Exported functions */

 static cmd_export_t cmds[] = {

-	{"allow_routing",  allow_routing_0,  0, 0, 0,

+	{"allow_routing",  (cmd_function)allow_routing_0,  0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_routing",  allow_routing_1,  1, single_fixup, 0,

+	{"allow_routing",  (cmd_function)allow_routing_1,  1, single_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_routing",  allow_routing_2,  2, load_fixup, 0,

+	{"allow_routing",  (cmd_function)allow_routing_2,  2, load_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_register", allow_register_1, 1, single_fixup, 0,

+	{"allow_register", (cmd_function)allow_register_1, 1, single_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_register", allow_register_2, 2, load_fixup, 0,

+	{"allow_register", (cmd_function)allow_register_2, 2, load_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_trusted",  allow_trusted,    0, 0, 0,

+	{"allow_trusted",  (cmd_function)allow_trusted,    0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_uri", allow_uri, 2, double_fixup, 0,

+	{"allow_uri",      (cmd_function)allow_uri, 2, double_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"set_address_group", set_address_group, 1, int_or_pvar_fixup, 0,

+	{"set_address_group", (cmd_function)set_address_group, 1, int_or_pvar_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_address", allow_address, 2, address_fixup, 0,

+	{"allow_address",  (cmd_function)allow_address, 2, address_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_source_address", allow_source_address, 1, int_or_pvar_fixup, 0,

+	{"allow_source_address", (cmd_function)allow_source_address, 1, int_or_pvar_fixup, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

-	{"allow_source_address_group", allow_source_address_group, 0, 0, 0,

+	{"allow_source_address_group", (cmd_function)allow_source_address_group, 0, 0, 0,

 		REQUEST_ROUTE | FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -68,7 +68,7 @@ struct list_link*       timer = 0;

 static cmd_export_t cmds[]={

-	{"pike_check_req",  pike_check_req,  0,  0, 0, REQUEST_ROUTE},

+	{"pike_check_req",  (cmd_function)pike_check_req,  0,  0, 0, REQUEST_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -81,7 +81,7 @@ static param_export_t params[]={

 static mi_export_t mi_cmds [] = {

-	{MI_PIKE_LIST,   mi_pike_list,   MI_NO_INPUT_FLAG,  0,  0 },

+	{MI_PIKE_LIST, mi_pike_list,   MI_NO_INPUT_FLAG,  0,  0 },

 	{0,0,0,0,0}

 };

@@ -142,15 +142,15 @@ struct sl_binds slb;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"save",         save,         1,    save_fixup, 0,

+	{"save",         (cmd_function)save,         1,    save_fixup, 0,

 			REQUEST_ROUTE },

-	{"save",         save,         2,    save_fixup, 0,

+	{"save",         (cmd_function)save,         2,    save_fixup, 0,

 			REQUEST_ROUTE },

-	{"lookup",       lookup,       1,  domain_fixup, 0,

+	{"lookup",       (cmd_function)lookup,       1,  domain_fixup, 0,

 			REQUEST_ROUTE | FAILURE_ROUTE },

-	{"registered",   registered,   1,  domain_fixup, 0,

+	{"registered",   (cmd_function)registered,   1,  domain_fixup, 0,

 			REQUEST_ROUTE | FAILURE_ROUTE },

-	{"add_sock_hdr", add_sock_hdr, 1,     str_fixup, 0,

+	{"add_sock_hdr", (cmd_function)add_sock_hdr, 1,     str_fixup, 0,

 			REQUEST_ROUTE },

 	{0, 0, 0, 0, 0, 0}

 };

@@ -84,22 +84,21 @@ static int w_is_direction(struct sip_msg *,char *, char *);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"loose_route",          loose_route,           0,     0, 0,

+	{"loose_route",          (cmd_function)loose_route,           0,     0, 0,

 			REQUEST_ROUTE},

-	{"record_route",         w_record_route,        0,     0, 0,

+	{"record_route",         (cmd_function)w_record_route,        0,     0, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"record_route",         w_record_route,        1,     it_list_fixup, 0,

+	{"record_route",         (cmd_function)w_record_route,        1,     it_list_fixup, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"record_route_preset",  w_record_route_preset, 1,     it_list_fixup, 0,

+	{"record_route_preset",  (cmd_function)w_record_route_preset, 1,     it_list_fixup, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"add_rr_param",         w_add_rr_param,        1,     it_list_fixup, 0,

+	{"add_rr_param",         (cmd_function)w_add_rr_param,        1,     it_list_fixup, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

-	{"check_route_param",    w_check_route_param,   1,     fixup_str2regexp, 0,

+	{"check_route_param",    (cmd_function)w_check_route_param,   1,     fixup_str2regexp, 0,

 			REQUEST_ROUTE},

-	{"is_direction",         w_is_direction,        1,     direction_fixup, 0,

+	{"is_direction",         (cmd_function)w_is_direction,        1,     direction_fixup, 0,

 			REQUEST_ROUTE},

-	{"load_rr",              (cmd_function)load_rr, 0,     0, 0,

-			0},

+	{"load_rr",              (cmd_function)load_rr, 0, 0, 0, 0},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -110,7 +110,7 @@ register_slcb_t register_slcb_f=NULL;

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"sip_trace", sip_trace, 0, 0, 0,

+	{"sip_trace", (cmd_function)sip_trace, 0, 0, 0,

 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -71,9 +71,9 @@ stat_var *rcv_acks;

 static cmd_export_t cmds[]={

-	{"sl_send_reply",   w_sl_send_reply,            2,  fixup_sl_send_reply, 0,

+	{"sl_send_reply",   (cmd_function)w_sl_send_reply,            2,  fixup_sl_send_reply, 0,

 			REQUEST_ROUTE | ERROR_ROUTE },

-	{"sl_reply_error",  w_sl_reply_error,           0,  0, 0,

+	{"sl_reply_error",  (cmd_function)w_sl_reply_error,           0,  0, 0,

 			REQUEST_ROUTE},

 	{"register_slcb",  (cmd_function)register_slcb, 0,  0, 0,

 			0},

@@ -86,9 +86,9 @@ static proc_export_t sms_procs[] = {

 static cmd_export_t cmds[]={

-	{"sms_send_msg_to_net", w_sms_send_msg_to_net, 1, 

+	{"sms_send_msg_to_net", (cmd_function)w_sms_send_msg_to_net, 1, 

 	     fixup_sms_send_msg_to_net, 0, REQUEST_ROUTE},

-	{"sms_send_msg",        w_sms_send_msg,        0,  

+	{"sms_send_msg",        (cmd_function)w_sms_send_msg,        0,  

 	     0, 0,                         REQUEST_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -71,8 +71,8 @@ db_con_t* db_handle=0;   /* Database connection handle */

 /* Exported functions */

 static cmd_export_t cmds[] = {

-	{"sd_lookup", sd_lookup, 1, 0, 0, REQUEST_ROUTE},

-	{"sd_lookup", sd_lookup, 2, fixup_sd, 0, REQUEST_ROUTE},

+	{"sd_lookup", (cmd_function)sd_lookup, 1, 0, 0, REQUEST_ROUTE},

+	{"sd_lookup", (cmd_function)sd_lookup, 2, fixup_sd, 0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -89,7 +89,7 @@ struct dlg_binds *dlg_binds = &dialog_st;

  * Script commands we export.

  */

 static cmd_export_t cmds[]={

-	{"sstCheckMin", sst_check_min, 1, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE },

+	{"sstCheckMin", (cmd_function)sst_check_min, 1, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE },

 	{0,0,0,0,0,0}

 };

@@ -48,9 +48,9 @@ static int fixup_stat(void** param, int param_no);

 static cmd_export_t cmds[]={

-	{"update_stat",  w_update_stat,  2, fixup_stat, 0,

+	{"update_stat",  (cmd_function)w_update_stat,  2, fixup_stat, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE},

-	{"reset_stat",   w_reset_stat,    1, fixup_stat, 0,

+	{"reset_stat",   (cmd_function)w_reset_stat,    1, fixup_stat, 0,

 			REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE},

 	{0,0,0,0,0,0}

 };

@@ -135,43 +135,43 @@ stat_var *tm_trans_inuse;

 static cmd_export_t cmds[]={

-	{"t_newtran",            w_t_newtran,             0, 0,

+	{"t_newtran",            (cmd_function)w_t_newtran,             0, 0,

 			0, REQUEST_ROUTE},

-	{"t_reply",              w_t_reply,               2, fixup_t_send_reply,

+	{"t_reply",              (cmd_function)w_t_reply,               2, fixup_t_send_reply,

 			0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"t_release",            w_t_release,             0, 0,

+	{"t_release",            (cmd_function)w_t_release,             0, 0,

 			0, REQUEST_ROUTE},

-	{"t_replicate",          w_t_replicate,           1, fixup_t_replicate,

+	{"t_replicate",          (cmd_function)w_t_replicate,           1, fixup_t_replicate,

 			0, REQUEST_ROUTE},

-	{"t_replicate",          w_t_replicate,           2, fixup_t_replicate,

+	{"t_replicate",          (cmd_function)w_t_replicate,           2, fixup_t_replicate,

 			0, REQUEST_ROUTE},

-	{"t_relay",              w_t_relay,               0, 0,

+	{"t_relay",              (cmd_function)w_t_relay,               0, 0,

 			0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"t_relay",              w_t_relay,               1, fixup_t_relay1,

+	{"t_relay",              (cmd_function)w_t_relay,               1, fixup_t_relay1,

 			0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"t_relay",              w_t_relay,               2, fixup_t_relay2,

+	{"t_relay",              (cmd_function)w_t_relay,               2, fixup_t_relay2,

 			0, REQUEST_ROUTE | FAILURE_ROUTE },

-	{"t_on_failure",         w_t_on_negative,         1, fixup_str2int,

+	{"t_on_failure",         (cmd_function)w_t_on_negative,         1, fixup_str2int,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"t_on_reply",           w_t_on_reply,            1, fixup_str2int,

+	{"t_on_reply",           (cmd_function)w_t_on_reply,            1, fixup_str2int,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"t_on_branch",          w_t_on_branch,           1, fixup_str2int,

+	{"t_on_branch",          (cmd_function)w_t_on_branch,           1, fixup_str2int,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"t_check_status",       t_check_status,          1, fixup_str2regexp,

+	{"t_check_status",       (cmd_function)t_check_status,          1, fixup_str2regexp,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"t_write_req",         t_write_req,              2, fixup_t_write,

+	{"t_write_req",          (cmd_function)t_write_req,              2, fixup_t_write,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE },

-	{"t_write_unix",        t_write_unix,             2, fixup_t_write,

+	{"t_write_unix",         (cmd_function)t_write_unix,             2, fixup_t_write,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE },

-	{"t_flush_flags",       t_flush_flags,            0, 0,

+	{"t_flush_flags",        (cmd_function)t_flush_flags,            0, 0,

 			0, REQUEST_ROUTE | BRANCH_ROUTE  },

-	{"t_local_replied",     t_local_replied,          1, fixup_local_replied,

+	{"t_local_replied",      (cmd_function)t_local_replied,          1, fixup_local_replied,

 			0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE },

-	{"t_check_trans",       t_check_trans,            0, 0,

+	{"t_check_trans",        (cmd_function)t_check_trans,            0, 0,

 			0, REQUEST_ROUTE | BRANCH_ROUTE },

-	{"t_was_cancelled",     t_was_cancelled,          0, 0,

+	{"t_was_cancelled",      (cmd_function)t_was_cancelled,          0, 0,

 			0, FAILURE_ROUTE | ONREPLY_ROUTE },

-	{"load_tm",             (cmd_function)load_tm,    0, 0,

+	{"load_tm",              (cmd_function)load_tm,    0, 0,

 			0, 0},

 	{0,0,0,0,0,0}

 };

@@ -454,7 +454,7 @@ int load_tm( struct tm_binds *tmb)

 	tmb->register_tmcb = register_tmcb;

 	/* relay function */

-	tmb->t_relay = w_t_relay;

+	tmb->t_relay = (cmd_function)w_t_relay;

 	/* reply functions */

 	tmb->t_reply = (treply_f)w_t_reply;

 	tmb->t_reply_with_body = t_reply_with_body;

@@ -80,13 +80,13 @@ static void mod_destroy(void);

 /* Exported functions */

 static cmd_export_t cmds[]={

-	{"uac_replace_from",  w_replace_from2,  2, fixup_replace_from2, 0,

+	{"uac_replace_from",  (cmd_function)w_replace_from2,  2, fixup_replace_from2, 0,

 			REQUEST_ROUTE },

-	{"uac_replace_from",  w_replace_from1,  1, fixup_replace_from1, 0,

+	{"uac_replace_from",  (cmd_function)w_replace_from1,  1, fixup_replace_from1, 0,

 			REQUEST_ROUTE },

-	{"uac_restore_from",  w_restore_from,   0,                  0, 0,

+	{"uac_restore_from",  (cmd_function)w_restore_from,   0,                  0, 0,

 			REQUEST_ROUTE },

-	{"uac_auth",          w_uac_auth,       0,                  0, 0,

+	{"uac_auth",          (cmd_function)w_uac_auth,       0,                  0, 0,

 			FAILURE_ROUTE },

 	{0,0,0,0,0,0}

 };

@@ -68,13 +68,13 @@ static int setf_fixup(void** param, int param_no);

 static cmd_export_t cmds[] = {

-	{"set_deny_filter",   w_set_deny,      2,  setf_fixup, 0,

+	{"set_deny_filter",   (cmd_function)w_set_deny,      2,  setf_fixup, 0,

 			FAILURE_ROUTE },

-	{"set_accept_filter", w_set_accept,    2,  setf_fixup, 0,

+	{"set_accept_filter", (cmd_function)w_set_accept,    2,  setf_fixup, 0,

 			FAILURE_ROUTE },

-	{"get_redirects",      w_get_redirect2,  2,  get_redirect_fixup, 0,

+	{"get_redirects",     (cmd_function)w_get_redirect2,  2,  get_redirect_fixup, 0,

 			FAILURE_ROUTE },

-	{"get_redirects",      w_get_redirect1,  1,  get_redirect_fixup, 0,

+	{"get_redirects",     (cmd_function)w_get_redirect1,  1,  get_redirect_fixup, 0,

 			FAILURE_ROUTE },

 	{0, 0, 0, 0, 0, 0}

 };

@@ -56,13 +56,13 @@ static int pvar_fixup(void** param, int param_no);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"is_user",        is_user,        1, str_fixup, 0, REQUEST_ROUTE},

-	{"has_totag", 	   has_totag,      0, 0, 0,         REQUEST_ROUTE},

-	{"uri_param",      uri_param_1,    1, str_fixup, 0, REQUEST_ROUTE},

-	{"uri_param",      uri_param_2,    2, uri_fixup, 0, REQUEST_ROUTE},

-	{"add_uri_param",  add_uri_param,  1, str_fixup, 0, REQUEST_ROUTE},

-	{"tel2sip",        tel2sip,        0, 0,         0, REQUEST_ROUTE},

-	{"is_uri_user_e164", is_uri_user_e164, 1, pvar_fixup, 0,

+	{"is_user",        (cmd_function)is_user,        1, str_fixup, 0, REQUEST_ROUTE},

+	{"has_totag", 	   (cmd_function)has_totag,      0, 0, 0,         REQUEST_ROUTE},

+	{"uri_param",      (cmd_function)uri_param_1,    1, str_fixup, 0, REQUEST_ROUTE},

+	{"uri_param",      (cmd_function)uri_param_2,    2, uri_fixup, 0, REQUEST_ROUTE},

+	{"add_uri_param",  (cmd_function)add_uri_param,  1, str_fixup, 0, REQUEST_ROUTE},

+	{"tel2sip",        (cmd_function)tel2sip,        0, 0,         0, REQUEST_ROUTE},

+	{"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, pvar_fixup, 0,

 	 REQUEST_ROUTE|FAILURE_ROUTE},

 	{0, 0, 0, 0, 0, 0}

 };

@@ -101,9 +101,9 @@ static int fixup_exist(void** param, int param_no);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"check_to",       check_to,       0, 0, 0,           REQUEST_ROUTE},

-	{"check_from",     check_from,     0, 0, 0,           REQUEST_ROUTE},

-	{"does_uri_exist", does_uri_exist, 0, fixup_exist, 0, REQUEST_ROUTE},

+	{"check_to",       (cmd_function)check_to,       0, 0, 0,           REQUEST_ROUTE},

+	{"check_from",     (cmd_function)check_from,     0, 0, 0,           REQUEST_ROUTE},

+	{"does_uri_exist", (cmd_function)does_uri_exist, 0, fixup_exist, 0, REQUEST_ROUTE},

 	{0, 0, 0, 0, 0, 0}