Skip to content

Commit

Permalink
Read MHD_VERSION in order to check the existence of enum MHD_Result (…
Browse files Browse the repository at this point in the history 
…see #3366)
  • Loading branch information
@atoppi
atoppi committed May 3, 2024
1 parent e3f6b0b commit 6d78789
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 25 deletions.
7 changes: 0 additions & 7 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,13 +550,6 @@ PKG_CHECK_MODULES([MHD],
AC_SUBST([MHD_CFLAGS])
AC_SUBST([MHD_LIBS])
AM_CONDITIONAL([ENABLE_REST], [test "x$enable_rest" = "xyes"])
AM_COND_IF([ENABLE_REST],
[
AC_CHECK_TYPES([enum MHD_Result],
[],
[],
[#include <microhttpd.h>])
])

AC_CHECK_LIB([websockets],
[lws_create_vhost],
Expand Down
36 changes: 18 additions & 18 deletions src/transports/janus_http.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
#include <netdb.h>

#include <microhttpd.h>
#ifdef HAVE_ENUM_MHD_RESULT
/* enum MHD_Result introduced in libmicrohttpd v0.9.71 */
typedef enum MHD_Result MHD_Result;
#if defined(MHD_VERSION) && MHD_VERSION >= 0x00097002
/* enum MHD_Result introduced in libmicrohttpd v0.9.71 */
typedef enum MHD_Result janus_MHD_Result;
#else
typedef int MHD_Result;
typedef int janus_MHD_Result;
#endif


Expand Down Expand Up @@ -265,17 +265,17 @@ static GSource *janus_http_request_timeout_create(janus_transport_session *ts, j


/* Callback (libmicrohttpd) invoked when a new connection is attempted on the REST API */
static MHD_Result janus_http_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen);
static janus_MHD_Result janus_http_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen);
/* Callback (libmicrohttpd) invoked when a new connection is attempted on the admin/monitor webserver */
static MHD_Result janus_http_admin_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen);
static janus_MHD_Result janus_http_admin_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen);
/* Callback (libmicrohttpd) invoked when an HTTP message (GET, POST, OPTIONS, etc.) is available */
static MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connection,
static janus_MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **ptr);
/* Callback (libmicrohttpd) invoked when an admin/monitor HTTP message (GET, POST, OPTIONS, etc.) is available */
static MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *connection,
static janus_MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **ptr);
/* Callback (libmicrohttpd) invoked when headers of an incoming HTTP message have been parsed */
static MHD_Result janus_http_headers(void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
static janus_MHD_Result janus_http_headers(void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
/* Callback (libmicrohttpd) invoked when a request has been processed and can be freed */
static void janus_http_request_completed(void *cls, struct MHD_Connection *connection,
void **con_cls, enum MHD_RequestTerminationCode toe);
Expand All @@ -284,9 +284,9 @@ static ssize_t janus_http_response_callback(void *cls, uint64_t pos, char *buf,
/* Worker to handle requests that are actually long polls */
static int janus_http_notifier(janus_http_msg *msg);
/* Helper to quickly send a success response */
static MHD_Result janus_http_return_success(janus_transport_session *ts, char *payload);
static janus_MHD_Result janus_http_return_success(janus_transport_session *ts, char *payload);
/* Helper to quickly send an error response */
static MHD_Result janus_http_return_error(janus_transport_session *ts, uint64_t session_id,
static janus_MHD_Result janus_http_return_error(janus_transport_session *ts, uint64_t session_id,
const char *transaction, gint error, const char *format, ...) G_GNUC_PRINTF(5, 6);


Expand Down Expand Up @@ -1316,7 +1316,7 @@ json_t *janus_http_query_transport(json_t *request) {
}

/* Connection notifiers */
static MHD_Result janus_http_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen) {
static janus_MHD_Result janus_http_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen) {
janus_network_address naddr;
janus_network_address_string_buffer naddr_buf;
if(janus_network_address_from_sockaddr((struct sockaddr *)addr, &naddr) != 0 ||
Expand All @@ -1335,7 +1335,7 @@ static MHD_Result janus_http_client_connect(void *cls, const struct sockaddr *ad
return MHD_YES;
}

static MHD_Result janus_http_admin_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen) {
static janus_MHD_Result janus_http_admin_client_connect(void *cls, const struct sockaddr *addr, socklen_t addrlen) {
janus_network_address naddr;
janus_network_address_string_buffer naddr_buf;
if(janus_network_address_from_sockaddr((struct sockaddr *)addr, &naddr) != 0 ||
Expand All @@ -1356,7 +1356,7 @@ static MHD_Result janus_http_admin_client_connect(void *cls, const struct sockad


/* WebServer requests handler */
static MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connection,
static janus_MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size, void **ptr) {
if(!g_atomic_int_get(&initialized) || g_atomic_int_get(&stopping))
Expand Down Expand Up @@ -1780,7 +1780,7 @@ static MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connectio
}

/* Admin/monitor WebServer requests handler */
static MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *connection,
static janus_MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size, void **ptr) {
if(!g_atomic_int_get(&initialized) || g_atomic_int_get(&stopping))
Expand Down Expand Up @@ -2055,7 +2055,7 @@ static MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *con
return ret;
}

static MHD_Result janus_http_headers(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) {
static janus_MHD_Result janus_http_headers(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) {
janus_http_msg *request = (janus_http_msg *)cls;
JANUS_LOG(LOG_DBG, "%s: %s\n", key, value);
if(!request)
Expand Down Expand Up @@ -2204,7 +2204,7 @@ static int janus_http_notifier(janus_http_msg *msg) {
}

/* Helper to quickly send a success response */
static MHD_Result janus_http_return_success(janus_transport_session *ts, char *payload) {
static janus_MHD_Result janus_http_return_success(janus_transport_session *ts, char *payload) {
if(!payload) {
JANUS_LOG(LOG_ERR, "Invalid payload...\n");
return MHD_NO;
Expand Down Expand Up @@ -2232,7 +2232,7 @@ static MHD_Result janus_http_return_success(janus_transport_session *ts, char *p
}

/* Helper to quickly send an error response */
static MHD_Result janus_http_return_error(janus_transport_session *ts, uint64_t session_id,
static janus_MHD_Result janus_http_return_error(janus_transport_session *ts, uint64_t session_id,
const char *transaction, gint error, const char *format, ...) {
gchar *error_string = NULL;
gchar error_buf[512];
Expand Down

0 comments on commit 6d78789

Please sign in to comment.