From 079c99c47fbddcfb57b31e76c7b9aced3283214b Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Thu, 26 Sep 2013 13:25:51 +0100
Subject: [PATCH] Started to restore single callback function
---
mongoose.c | 9 +++++++++
mongoose.h | 11 +++++++++++
2 files changed, 20 insertions(+)
diff --git a/mongoose.c b/mongoose.c
index da068a012..d9940ab59 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -491,6 +491,7 @@ struct mg_context {
SSL_CTX *ssl_ctx; // SSL context
char *config[NUM_OPTIONS]; // Mongoose configuration parameters
struct mg_callbacks callbacks; // User-defined callback function
+ mg_callback_t user_callback; // User-defined callback function
void *user_data; // User-defined data
struct socket *listening_sockets;
@@ -540,6 +541,14 @@ const char **mg_get_valid_option_names(void) {
return config_options;
}
+static int call_user(enum mg_event ev, struct mg_connection *conn, void *p) {
+ if (conn != NULL && conn->ctx != NULL) {
+ conn->request_info.user_data = conn->ctx->user_data;
+ }
+ return conn == NULL || conn->ctx == NULL || conn->ctx->user_callback == NULL ?
+ 0 : conn->ctx->user_callback(ev, conn, p);
+}
+
static FILE *mg_fopen(const char *path, const char *mode) {
#ifdef _WIN32
wchar_t wbuf[PATH_MAX], wmode[20];
diff --git a/mongoose.h b/mongoose.h
index 1728963fe..a79e6090a 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -49,6 +49,17 @@ struct mg_request_info {
} http_headers[64]; // Maximum 64 headers
};
+enum mg_event {
+ MG_REQUEST_BEGIN,
+ MG_REQUEST_END,
+ MG_HTTP_ERROR,
+ MG_EVENT_LOG,
+ MG_THREAD_BEGIN,
+ MG_THREAD_END
+};
+typedef int (*mg_callback_t)(enum mg_event event,
+ struct mg_connection *conn,
+ void *data);
struct mg_callbacks {
int (*begin_request)(struct mg_connection *);
--
GitLab