2
0
Эх сурвалжийг харах

corex: reformat exports structures

Daniel-Constantin Mierla 1 жил өмнө
parent
commit
6b6c0663d3

+ 92 - 85
src/modules/corex/corex_mod.c

@@ -93,103 +93,110 @@ static int corex_dns_cache_param_add(str *pval);
 
 static int corex_sip_reply_out(sr_event_param_t *evp);
 
+/*clang-format off*/
 static pv_export_t mod_pvs[] = {
-		{{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0,
-				pv_parse_cfg_name, 0, 0, 0},
-		{{"lsock", (sizeof("lsock") - 1)}, PVT_OTHER, pv_get_lsock, 0,
-				pv_parse_lsock_name, 0, 0, 0},
-		{{0, 0}, 0, 0, 0, 0, 0, 0, 0}};
+	{{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0,
+		pv_parse_cfg_name, 0, 0, 0},
+	{{"lsock", (sizeof("lsock") - 1)}, PVT_OTHER, pv_get_lsock, 0,
+		pv_parse_lsock_name, 0, 0, 0},
+	{{0, 0}, 0, 0, 0, 0, 0, 0, 0}
+};
 
 /* Exported functions */
 static tr_export_t mod_trans[] = {
-		{{"sock", sizeof("sock") - 1}, tr_sock_parse}, {{0, 0}, 0}};
-
-static cmd_export_t cmds[] = {{"forward_reply", (cmd_function)w_forward_reply,
-									  0, 0, 0, CORE_ONREPLY_ROUTE},
-		{"append_branch", (cmd_function)w_append_branch, 0, 0, 0,
-				REQUEST_ROUTE | FAILURE_ROUTE},
-		{"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null,
-				fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
-		{"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve,
-				fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE},
-		{"send_udp", (cmd_function)w_send_udp, 0, 0, 0,
-				REQUEST_ROUTE | FAILURE_ROUTE},
-		{"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null,
-				fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
-		{"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0,
-				REQUEST_ROUTE | FAILURE_ROUTE},
-		{"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null,
-				fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
-		{"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve,
-				fixup_free_spve_spve, ANY_ROUTE},
-		{"sendx", (cmd_function)w_sendx, 3, fixup_spve_all, fixup_free_spve_all,
-				ANY_ROUTE},
-		{"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE},
-		{"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null,
-				fixup_free_spve_null, ANY_ROUTE},
-		{"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null,
-				fixup_free_spve_null, ANY_ROUTE},
-		{"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1,
-				fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
-		{"file_read", (cmd_function)w_file_read, 2, fixup_file_op, 0,
-				ANY_ROUTE},
-		{"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve,
-				fixup_free_spve_spve, ANY_ROUTE},
-		{"setxflag", (cmd_function)w_setxflag, 1, fixup_igp_null,
-				fixup_free_igp_null, ANY_ROUTE},
-		{"resetxflag", (cmd_function)w_resetxflag, 1, fixup_igp_null,
-				fixup_free_igp_null, ANY_ROUTE},
-		{"isxflagset", (cmd_function)w_isxflagset, 1, fixup_igp_null,
-				fixup_free_igp_null, ANY_ROUTE},
-		{"set_send_socket", (cmd_function)w_set_send_socket, 1, fixup_spve_null,
-				fixup_free_spve_null, ANY_ROUTE},
-		{"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1,
-				fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
-		{"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null,
-				fixup_free_spve_null, ANY_ROUTE},
-		{"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1,
-				fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
-		{"set_source_address", (cmd_function)w_set_source_address, 1,
-				fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
-		{"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null,
-				fixup_free_igp_null, ANY_ROUTE},
-		{"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1,
-				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
-		{"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1,
-				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
-		{"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1,
-				fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
-		{"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE},
-		{"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null,
-				fixup_free_spve_null, ANY_ROUTE},
-
-		{0, 0, 0, 0, 0, 0}};
+	{{"sock", sizeof("sock") - 1}, tr_sock_parse},
+	{{0, 0}, 0}
+};
+
+static cmd_export_t cmds[] = {
+	{"forward_reply", (cmd_function)w_forward_reply, 0,
+		0, 0, CORE_ONREPLY_ROUTE},
+	{"append_branch", (cmd_function)w_append_branch, 0,
+		0, 0, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"append_branch", (cmd_function)w_append_branch, 1,
+		fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"append_branch", (cmd_function)w_append_branch, 2,
+		fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"send_udp", (cmd_function)w_send_udp, 0,
+		0, 0, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"send_udp", (cmd_function)w_send_udp, 1,
+		fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"send_tcp", (cmd_function)w_send_tcp, 0,
+		0, 0, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"send_tcp", (cmd_function)w_send_tcp, 1,
+		fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE},
+	{"send_data", (cmd_function)w_send_data, 2,
+		fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE},
+	{"sendx", (cmd_function)w_sendx, 3,
+		fixup_spve_all, fixup_free_spve_all, ANY_ROUTE},
+	{"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE},
+	{"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"file_read", (cmd_function)w_file_read, 2,
+		fixup_file_op, 0, ANY_ROUTE},
+	{"file_write", (cmd_function)w_file_write, 2,
+		fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE},
+	{"setxflag", (cmd_function)w_setxflag, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"resetxflag", (cmd_function)w_resetxflag, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"isxflagset", (cmd_function)w_isxflagset, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"set_send_socket", (cmd_function)w_set_send_socket, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"set_recv_socket", (cmd_function)w_set_recv_socket, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"set_source_address", (cmd_function)w_set_source_address, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+	{"via_add_srvid", (cmd_function)w_via_add_srvid, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1,
+		fixup_igp_null, fixup_free_igp_null, ANY_ROUTE},
+	{"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE},
+	{"is_socket_name", (cmd_function)w_is_socket_name, 1,
+		fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},
+
+	{0, 0, 0, 0, 0, 0}
+};
 
 static param_export_t params[] = {
-		{"alias_subdomains", STR_PARAM | USE_FUNC_PARAM,
+	{"alias_subdomains", STR_PARAM | USE_FUNC_PARAM,
 				(void *)corex_alias_subdomains_param},
-		{"dns_cache", PARAM_STR | USE_FUNC_PARAM,
+	{"dns_cache", PARAM_STR | USE_FUNC_PARAM,
 				(void *)corex_dns_cache_param},
-		{"nio_intercept", INT_PARAM, &nio_intercept},
-		{"nio_min_msg_len", INT_PARAM, &nio_min_msg_len},
-		{"nio_msg_avp", PARAM_STR, &nio_msg_avp_param},
-		{"evcb_reply_out", PARAM_STR, &corex_evcb_reply_out},
+	{"nio_intercept", INT_PARAM, &nio_intercept},
+	{"nio_min_msg_len", INT_PARAM, &nio_min_msg_len},
+	{"nio_msg_avp", PARAM_STR, &nio_msg_avp_param},
+	{"evcb_reply_out", PARAM_STR, &corex_evcb_reply_out},
 
-		{0, 0, 0}};
+	{0, 0, 0}
+};
 
 struct module_exports exports = {
-		"corex",		 /* module name */
-		DEFAULT_DLFLAGS, /* dlopen flags */
-		cmds,			 /* cmd (cfg function) exports */
-		params,			 /* param exports */
-		0,				 /* RPC method exports */
-		mod_pvs,		 /* pseudo-variables exports */
-		0,				 /* response handling function */
-		mod_init,		 /* module init function */
-		child_init,		 /* per-child init function */
-		mod_destroy		 /* module destroy function */
+	"corex",		 /* module name */
+	DEFAULT_DLFLAGS, /* dlopen flags */
+	cmds,			 /* cmd (cfg function) exports */
+	params,			 /* param exports */
+	0,				 /* RPC method exports */
+	mod_pvs,		 /* pseudo-variables exports */
+	0,				 /* response handling function */
+	mod_init,		 /* module init function */
+	child_init,		 /* per-child init function */
+	mod_destroy		 /* module destroy function */
 };
-
+/*clang-format on*/
 
 /**
  * init module function

+ 13 - 10
src/modules/corex/corex_rpc.c

@@ -251,16 +251,19 @@ static void corex_rpc_debug(rpc_t *rpc, void *ctx)
 	}
 }
 
-rpc_export_t corex_rpc_cmds[] = {{"corex.list_sockets", corex_rpc_list_sockets,
-										 corex_rpc_list_sockets_doc, RET_ARRAY},
-		{"corex.list_aliases", corex_rpc_list_aliases,
-				corex_rpc_list_aliases_doc, RET_ARRAY},
-		{"corex.shm_status", corex_rpc_shm_status, corex_rpc_shm_status_doc, 0},
-		{"corex.shm_summary", corex_rpc_shm_summary, corex_rpc_shm_summary_doc,
-				0},
-		{"corex.pkg_summary", corex_rpc_pkg_summary, corex_rpc_pkg_summary_doc,
-				0},
-		{"corex.debug", corex_rpc_debug, corex_rpc_debug_doc, 0}, {0, 0, 0, 0}};
+/*clang-format off*/
+rpc_export_t corex_rpc_cmds[] = {
+	{"corex.list_sockets", corex_rpc_list_sockets,
+			corex_rpc_list_sockets_doc, RET_ARRAY},
+	{"corex.list_aliases", corex_rpc_list_aliases,
+			corex_rpc_list_aliases_doc, RET_ARRAY},
+	{"corex.shm_status", corex_rpc_shm_status, corex_rpc_shm_status_doc, 0},
+	{"corex.shm_summary", corex_rpc_shm_summary, corex_rpc_shm_summary_doc, 0},
+	{"corex.pkg_summary", corex_rpc_pkg_summary, corex_rpc_pkg_summary_doc, 0},
+	{"corex.debug", corex_rpc_debug, corex_rpc_debug_doc, 0},
+	{0, 0, 0, 0}
+};
+/*clang-format on*/
 
 /**
  * register RPC commands

+ 7 - 4
src/modules/corex/corex_rpc_shm.c

@@ -115,11 +115,14 @@ static void corex_rpc_shm_report(rpc_t *rpc, void *ctx)
 			mrep.min_used_frag_line);
 }
 
+/*clang-format off*/
 rpc_export_t corex_rpc_shm_cmds[] = {
-		{"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0},
-		{"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0},
-		{"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0},
-		{0, 0, 0, 0}};
+	{"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0},
+	{"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0},
+	{"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0},
+	{0, 0, 0, 0}
+};
+/*clang-format on*/
 
 /**
  * register RPC shm commands