diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/ats-tests/Makefile.am | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 5 | ||||
-rw-r--r-- | src/include/Makefile.am | 1 | ||||
-rw-r--r-- | src/namecache/plugin_namecache_flat.c | 2 | ||||
-rw-r--r-- | src/peerstore/plugin_peerstore_flat.c | 4 | ||||
-rw-r--r-- | src/rest-plugins/Makefile.am | 2 |
7 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 17476e485..40890ad1a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -71,6 +71,7 @@ case "$host_os" in | |||
71 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" | 71 | CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS" |
72 | CFLAGS="-fno-common $CFLAGS" | 72 | CFLAGS="-fno-common $CFLAGS" |
73 | AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS]) | 73 | AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS]) |
74 | AC_CHECK_LIB(intl, gettext) | ||
74 | build_target="darwin" | 75 | build_target="darwin" |
75 | DEFAULT_INTERFACE="\"en0\"" | 76 | DEFAULT_INTERFACE="\"en0\"" |
76 | LIBPREFIX= | 77 | LIBPREFIX= |
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index c85645b9d..83f9e1b6a 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -60,6 +60,7 @@ libgnunetatstesting_la_SOURCES = \ | |||
60 | libgnunetatstesting_la_LIBADD = \ | 60 | libgnunetatstesting_la_LIBADD = \ |
61 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 61 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
62 | $(top_builddir)/src/core/libgnunetcore.la \ | 62 | $(top_builddir)/src/core/libgnunetcore.la \ |
63 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
63 | $(top_builddir)/src/ats/libgnunetats.la \ | 64 | $(top_builddir)/src/ats/libgnunetats.la \ |
64 | $(top_builddir)/src/util/libgnunetutil.la \ | 65 | $(top_builddir)/src/util/libgnunetutil.la \ |
65 | $(GN_LIBINTL) | 66 | $(GN_LIBINTL) |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 21451651d..9db388e77 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2045,11 +2045,12 @@ create_response (void *cls, | |||
2045 | const char *us; | 2045 | const char *us; |
2046 | long upload_size; | 2046 | long upload_size; |
2047 | 2047 | ||
2048 | upload_size = 0; | ||
2048 | us = MHD_lookup_connection_value (con, | 2049 | us = MHD_lookup_connection_value (con, |
2049 | MHD_HEADER_KIND, | 2050 | MHD_HEADER_KIND, |
2050 | MHD_HTTP_HEADER_CONTENT_LENGTH); | 2051 | MHD_HTTP_HEADER_CONTENT_LENGTH); |
2051 | if ( (NULL != us) && | 2052 | if ( (NULL != us) && |
2052 | (1 == sscanf (us, | 2053 | (1 == sscanf (us, |
2053 | "%ld", | 2054 | "%ld", |
2054 | &upload_size)) && | 2055 | &upload_size)) && |
2055 | (upload_size >= 0) ) | 2056 | (upload_size >= 0) ) |
@@ -2149,7 +2150,7 @@ create_response (void *cls, | |||
2149 | curl_easy_setopt (s5r->curl, | 2150 | curl_easy_setopt (s5r->curl, |
2150 | CURLOPT_USE_SSL, | 2151 | CURLOPT_USE_SSL, |
2151 | CURLUSESSL_ALL); | 2152 | CURLUSESSL_ALL); |
2152 | if (NULL != s5r->dane_data) | 2153 | if (0 < s5r->num_danes) |
2153 | curl_easy_setopt (s5r->curl, | 2154 | curl_easy_setopt (s5r->curl, |
2154 | CURLOPT_SSL_VERIFYPEER, | 2155 | CURLOPT_SSL_VERIFYPEER, |
2155 | 0L); | 2156 | 0L); |
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 6b930178f..4e84e023c 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -106,6 +106,7 @@ gnunetinclude_HEADERS = \ | |||
106 | gnunet_regex_service.h \ | 106 | gnunet_regex_service.h \ |
107 | gnunet_rest_lib.h \ | 107 | gnunet_rest_lib.h \ |
108 | gnunet_rest_plugin.h \ | 108 | gnunet_rest_plugin.h \ |
109 | gnunet_rps_service.h \ | ||
109 | gnunet_revocation_service.h \ | 110 | gnunet_revocation_service.h \ |
110 | gnunet_scalarproduct_service.h \ | 111 | gnunet_scalarproduct_service.h \ |
111 | gnunet_scheduler_lib.h \ | 112 | gnunet_scheduler_lib.h \ |
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index 4323780d5..c093cb2a9 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c | |||
@@ -173,7 +173,7 @@ database_setup (struct Plugin *plugin) | |||
173 | &entry->query)); | 173 | &entry->query)); |
174 | GNUNET_STRINGS_base64_decode (block, | 174 | GNUNET_STRINGS_base64_decode (block, |
175 | strlen (block), | 175 | strlen (block), |
176 | &block_buffer); | 176 | (void**)&block_buffer); |
177 | entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer; | 177 | entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer; |
178 | if (GNUNET_OK != | 178 | if (GNUNET_OK != |
179 | GNUNET_CONTAINER_multihashmap_put (plugin->hm, | 179 | GNUNET_CONTAINER_multihashmap_put (plugin->hm, |
diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index cd1837e1a..0cd2522ec 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c | |||
@@ -440,7 +440,7 @@ database_setup (struct Plugin *plugin) | |||
440 | o = NULL; | 440 | o = NULL; |
441 | s = GNUNET_STRINGS_base64_decode (peer, | 441 | s = GNUNET_STRINGS_base64_decode (peer, |
442 | strlen (peer), | 442 | strlen (peer), |
443 | &o); | 443 | (void**)&o); |
444 | if (sizeof (struct GNUNET_PeerIdentity) == s) | 444 | if (sizeof (struct GNUNET_PeerIdentity) == s) |
445 | GNUNET_memcpy (&entry->peer, | 445 | GNUNET_memcpy (&entry->peer, |
446 | o, | 446 | o, |
@@ -451,7 +451,7 @@ database_setup (struct Plugin *plugin) | |||
451 | } | 451 | } |
452 | entry->value_size = GNUNET_STRINGS_base64_decode (value, | 452 | entry->value_size = GNUNET_STRINGS_base64_decode (value, |
453 | strlen (value), | 453 | strlen (value), |
454 | (char**)&entry->value); | 454 | (void**)&entry->value); |
455 | if (GNUNET_SYSERR == | 455 | if (GNUNET_SYSERR == |
456 | GNUNET_STRINGS_fancy_time_to_absolute (expiry, | 456 | GNUNET_STRINGS_fancy_time_to_absolute (expiry, |
457 | &entry->expiry)) | 457 | &entry->expiry)) |
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index f36154ebd..a49ab0ef0 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am | |||
@@ -67,6 +67,7 @@ libgnunet_plugin_rest_copying_la_LDFLAGS = \ | |||
67 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ | 67 | libgnunet_plugin_rest_peerinfo_la_SOURCES = \ |
68 | plugin_rest_peerinfo.c | 68 | plugin_rest_peerinfo.c |
69 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | 69 | libgnunet_plugin_rest_peerinfo_la_LIBADD = \ |
70 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
70 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 71 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
71 | $(top_builddir)/src/rest/libgnunetrest.la \ | 72 | $(top_builddir)/src/rest/libgnunetrest.la \ |
72 | $(top_builddir)/src/json/libgnunetjson.la \ | 73 | $(top_builddir)/src/json/libgnunetjson.la \ |
@@ -104,6 +105,7 @@ libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | |||
104 | libgnunet_plugin_rest_gns_la_SOURCES = \ | 105 | libgnunet_plugin_rest_gns_la_SOURCES = \ |
105 | plugin_rest_gns.c | 106 | plugin_rest_gns.c |
106 | libgnunet_plugin_rest_gns_la_LIBADD = \ | 107 | libgnunet_plugin_rest_gns_la_LIBADD = \ |
108 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | ||
107 | $(top_builddir)/src/gns/libgnunetgns.la \ | 109 | $(top_builddir)/src/gns/libgnunetgns.la \ |
108 | $(top_builddir)/src/rest/libgnunetrest.la \ | 110 | $(top_builddir)/src/rest/libgnunetrest.la \ |
109 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 111 | $(top_builddir)/src/identity/libgnunetidentity.la \ |