diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-04-09 00:29:16 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-04-09 00:29:16 +0200 |
commit | 8547143da77b0bae392758040313762eb60d7e86 (patch) | |
tree | 0e277ad44dfeb7a439df8f4d55f90688295e4e3d /src/transport | |
parent | 6fc0526b4c2ecb735cf2b697e2fbbed3c35af382 (diff) | |
download | gnunet-8547143da77b0bae392758040313762eb60d7e86.tar.gz gnunet-8547143da77b0bae392758040313762eb60d7e86.zip |
adapt code to work with latest MHD API
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 20bdb6273..eef83b29d 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "plugin_transport_http_common.h" | 33 | #include "plugin_transport_http_common.h" |
34 | #include <microhttpd.h> | 34 | #include <microhttpd.h> |
35 | #include <regex.h> | 35 | #include <regex.h> |
36 | 36 | #include "gnunet_mhd_compat.h" | |
37 | 37 | ||
38 | #if BUILD_HTTPS | 38 | #if BUILD_HTTPS |
39 | #define PLUGIN_NAME "https_server" | 39 | #define PLUGIN_NAME "https_server" |
@@ -1741,9 +1741,9 @@ add_cors_headers (struct MHD_Response *response) | |||
1741 | * @param upload_data upload data | 1741 | * @param upload_data upload data |
1742 | * @param upload_data_size size of @a upload_data | 1742 | * @param upload_data_size size of @a upload_data |
1743 | * @param httpSessionCache the session cache to remember the connection | 1743 | * @param httpSessionCache the session cache to remember the connection |
1744 | * @return MHD_YES if connection is accepted, MHD_NO on reject | 1744 | * @return #MHD_YES if connection is accepted, #MHD_NO on reject |
1745 | */ | 1745 | */ |
1746 | static int | 1746 | static MHD_RESULT |
1747 | server_access_cb (void *cls, | 1747 | server_access_cb (void *cls, |
1748 | struct MHD_Connection *mhd_connection, | 1748 | struct MHD_Connection *mhd_connection, |
1749 | const char *url, | 1749 | const char *url, |
@@ -1757,7 +1757,7 @@ server_access_cb (void *cls, | |||
1757 | struct ServerRequest *sc = *httpSessionCache; | 1757 | struct ServerRequest *sc = *httpSessionCache; |
1758 | struct GNUNET_ATS_Session *s; | 1758 | struct GNUNET_ATS_Session *s; |
1759 | struct MHD_Response *response; | 1759 | struct MHD_Response *response; |
1760 | int res = MHD_YES; | 1760 | MHD_RESULT res = MHD_YES; |
1761 | 1761 | ||
1762 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1762 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1763 | _ ( | 1763 | _ ( |
@@ -2025,9 +2025,9 @@ server_connection_cb (void *cls, | |||
2025 | * @param cls plugin as closure | 2025 | * @param cls plugin as closure |
2026 | * @param addr address of incoming connection | 2026 | * @param addr address of incoming connection |
2027 | * @param addr_len number of bytes in @a addr | 2027 | * @param addr_len number of bytes in @a addr |
2028 | * @return MHD_YES if connection is accepted, MHD_NO if connection is rejected | 2028 | * @return #MHD_YES if connection is accepted, #MHD_NO if connection is rejected |
2029 | */ | 2029 | */ |
2030 | static int | 2030 | static MHD_RESULT |
2031 | server_accept_cb (void *cls, | 2031 | server_accept_cb (void *cls, |
2032 | const struct sockaddr *addr, | 2032 | const struct sockaddr *addr, |
2033 | socklen_t addr_len) | 2033 | socklen_t addr_len) |