plugins/auth/auth.c | 2 +- plugins/cheetah/cheetah.c | 2 +- plugins/dirlisting/dirlisting.c | 2 +- plugins/liana/liana.c | 2 +- plugins/logger/logger.c | 4 ++-- plugins/mandril/mandril.c | 2 +- plugins/palm/palm.c | 4 ++-- src/include/MKPlugin.h | 30 ++++++++++++++++++++++++++++++ 8 files changed, 39 insertions(+), 9 deletions(-)
- Lauri
>From 164f2120fe04775487f76e607b2c2be387869a3c Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Thu, 24 May 2012 15:04:48 +0300 Subject: [PATCH 8/8] plugins: Properly control visibility, v2 Signed-off-by: Lauri Kasanen <[email protected]> --- plugins/auth/auth.c | 2 +- plugins/cheetah/cheetah.c | 2 +- plugins/dirlisting/dirlisting.c | 2 +- plugins/liana/liana.c | 2 +- plugins/logger/logger.c | 4 ++-- plugins/mandril/mandril.c | 2 +- plugins/palm/palm.c | 4 ++-- src/include/MKPlugin.h | 30 ++++++++++++++++++++++++++++++ 8 files changed, 39 insertions(+), 9 deletions(-) diff --git a/plugins/auth/auth.c b/plugins/auth/auth.c index c1c537d..64fb601 100644 --- a/plugins/auth/auth.c +++ b/plugins/auth/auth.c @@ -100,7 +100,7 @@ static int mk_auth_validate_user(struct users_file *users, return -1; } -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; diff --git a/plugins/cheetah/cheetah.c b/plugins/cheetah/cheetah.c index d2ff019..40017b3 100644 --- a/plugins/cheetah/cheetah.c +++ b/plugins/cheetah/cheetah.c @@ -118,7 +118,7 @@ void *mk_cheetah_init(void *args) /* This function is called when the plugin is loaded, it must * return */ -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; init_time = time(NULL); diff --git a/plugins/dirlisting/dirlisting.c b/plugins/dirlisting/dirlisting.c index 612929e..22f9279 100644 --- a/plugins/dirlisting/dirlisting.c +++ b/plugins/dirlisting/dirlisting.c @@ -791,7 +791,7 @@ int mk_dirhtml_init(struct client_session *cs, struct session_request *sr) return 0; } -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; return mk_dirhtml_conf(confdir); diff --git a/plugins/liana/liana.c b/plugins/liana/liana.c index 35b41ad..8ca53cc 100644 --- a/plugins/liana/liana.c +++ b/plugins/liana/liana.c @@ -38,7 +38,7 @@ MONKEY_PLUGIN("liana", /* shortname */ VERSION, /* version */ MK_PLUGIN_NETWORK_IO); /* hooks */ -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; return 0; diff --git a/plugins/logger/logger.c b/plugins/logger/logger.c index 9c476e3..741bfe1 100644 --- a/plugins/logger/logger.c +++ b/plugins/logger/logger.c @@ -292,7 +292,7 @@ static void mk_logger_print_details(void) fflush(stdout); } -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { int fd; mk_api = *api; @@ -343,7 +343,7 @@ void _mkp_exit() mk_api->mem_free(mk_logger_master_path); } -void _mkp_core_prctx() +int _mkp_core_prctx(struct server_config *config) { struct log_target *new; struct host *entry_host; diff --git a/plugins/mandril/mandril.c b/plugins/mandril/mandril.c index 634467b..9849753 100644 --- a/plugins/mandril/mandril.c +++ b/plugins/mandril/mandril.c @@ -207,7 +207,7 @@ static int mk_security_check_url(mk_pointer url) return 0; } -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; diff --git a/plugins/palm/palm.c b/plugins/palm/palm.c index 5e1f68f..5a0b591 100644 --- a/plugins/palm/palm.c +++ b/plugins/palm/palm.c @@ -165,7 +165,7 @@ static int mk_palm_send_headers(struct mk_palm_request *pr) return n; } -void _mkp_core_prctx(struct server_config *config) +int _mkp_core_prctx(struct server_config *config) { /* * Server Address Lookup @@ -204,7 +204,7 @@ void _mkp_core_thctx() mk_palm_protocol_thread_init(); } -int _mkp_init(void **api, char *confdir) +int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; palms = 0; diff --git a/src/include/MKPlugin.h b/src/include/MKPlugin.h index 32a371a..887299e 100644 --- a/src/include/MKPlugin.h +++ b/src/include/MKPlugin.h @@ -54,6 +54,36 @@ mk_plugin_key_t MK_EXPORT _mkp_data; #define PLUGIN_TRACE(...) do {} while(0) #endif +/* Hook defines */ +int MK_EXPORT _mkp_init(struct plugin_api **api, char *confdir); +void MK_EXPORT _mkp_exit(); +int MK_EXPORT _mkp_core_prctx(struct server_config *config); +void MK_EXPORT _mkp_core_thctx(); +int MK_EXPORT _mkp_stage_10(unsigned int socket, struct sched_connection *conx); +int MK_EXPORT _mkp_stage_20(struct client_session *cs, struct session_request *sr); +int MK_EXPORT _mkp_stage_30(struct plugin *plugin, struct client_session *cs, + struct session_request *sr); +int MK_EXPORT _mkp_stage_40(struct client_session *cs, struct session_request *sr); +int MK_EXPORT _mkp_stage_50(int sockfd); +int MK_EXPORT _mkp_network_io_accept(int server_fd); +int MK_EXPORT _mkp_network_io_read(int socket_fd, void *buf, int count); +int MK_EXPORT _mkp_network_io_write(int socket_fd, const void *buf, size_t count); +int MK_EXPORT _mkp_network_io_writev(int socket_fd, struct mk_iov *mk_io); +int MK_EXPORT _mkp_network_io_close(int socket_fd); +int MK_EXPORT _mkp_network_io_connect(char *host, int port); +int MK_EXPORT _mkp_network_io_send_file(int socket_fd, int file_fd, off_t *file_offset, + size_t file_count); +int MK_EXPORT _mkp_network_io_create_socket(int domain, int type, int protocol); +int MK_EXPORT _mkp_network_io_bind(int socket_fd, const struct sockaddr *addr, + socklen_t addrlen, int backlog); +int MK_EXPORT _mkp_network_io_server(int port, char *listen_addr); +int MK_EXPORT _mkp_event_read(int sockfd); +int MK_EXPORT _mkp_event_write(int sockfd); +int MK_EXPORT _mkp_event_error(int sockfd); +int MK_EXPORT _mkp_event_close(int sockfd); +int MK_EXPORT _mkp_event_timeout(int sockfd); + + /* * Redefine messages macros */ -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
