diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/test_gns_proxy.c | 8 | ||||
-rw-r--r-- | src/include/Makefile.am | 2 | ||||
-rw-r--r-- | src/reclaim/gnunet-reclaim.c | 2 | ||||
-rw-r--r-- | src/reclaim/plugin_reclaim_credential_jwt.c | 2 | ||||
-rw-r--r-- | src/seti/Makefile.am | 2 | ||||
-rw-r--r-- | src/setu/Makefile.am | 2 | ||||
-rw-r--r-- | src/setu/test_setu.conf | 32 | ||||
-rw-r--r-- | src/util/gnunet-qr.c | 7 | ||||
-rw-r--r-- | src/util/gnunet-uri.c | 2 |
9 files changed, 48 insertions, 11 deletions
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 13764d520..579de774f 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c @@ -189,7 +189,7 @@ copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) } -static int +static enum MHD_Result mhd_ahc (void *cls, struct MHD_Connection *connection, const char *url, @@ -528,8 +528,6 @@ run (void *cls, int main (int argc, char *const *argv) { - char *tmp_argv; - struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_option_uint16 ('p', "port", @@ -559,7 +557,7 @@ main (int argc, char *const *argv) } if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &tmp_argv)) + &argc, &argv)) return 2; GNUNET_log_setup ("gnunet-gns-proxy-test", "WARNING", @@ -570,7 +568,7 @@ main (int argc, char *const *argv) options, &run, NULL)) return 1; - GNUNET_free (tmp_argv); + GNUNET_free_nz ((void*) argv); return global_ret; } diff --git a/src/include/Makefile.am b/src/include/Makefile.am index e542038d3..202abb7ac 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -99,6 +99,8 @@ gnunetinclude_HEADERS = \ gnunet_secretsharing_service.h \ gnunet_service_lib.h \ gnunet_set_service.h \ + gnunet_seti_service.h \ + gnunet_setu_service.h \ gnunet_signal_lib.h \ gnunet_signatures.h \ gnunet_socks.h \ diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c index ab281a645..b9306b802 100644 --- a/src/reclaim/gnunet-reclaim.c +++ b/src/reclaim/gnunet-reclaim.c @@ -862,7 +862,7 @@ main (int argc, char *const argv[]) gettext_noop ("List credentials for EGO"), &list_credentials), GNUNET_GETOPT_option_string ('I', - "Credential ID", + "credential-id", "CREDENTIAL_ID", gettext_noop ( "Credential to use for attribute"), diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c index 148865223..6f52f3a4e 100644 --- a/src/reclaim/plugin_reclaim_credential_jwt.c +++ b/src/reclaim/plugin_reclaim_credential_jwt.c @@ -177,6 +177,8 @@ jwt_parse_attributes (void *cls, json_object_foreach (json_val, key, value) { if (0 == strcmp ("iss", key)) continue; + if (0 == strcmp ("jti", key)) + continue; if (0 == strcmp ("exp", key)) continue; if (0 == strcmp ("iat", key)) diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am index b4980b670..522f33ece 100644 --- a/src/seti/Makefile.am +++ b/src/seti/Makefile.am @@ -37,7 +37,7 @@ gnunet_seti_profiler_LDADD = \ gnunet_service_seti_SOURCES = \ gnunet-service-seti.c \ - gnunet-service-set_protocol.h + gnunet-service-seti_protocol.h gnunet_service_seti_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am index b37ceba51..cc7711462 100644 --- a/src/setu/Makefile.am +++ b/src/setu/Makefile.am @@ -46,7 +46,7 @@ gnunet_setu_ibf_profiler_LDADD = \ $(GN_LIBINTL) gnunet_service_setu_SOURCES = \ - gnunet-service-setu.c gnunet-service-setu.h \ + gnunet-service-setu.c gnunet-service-setu_protocol.h \ ibf.c ibf.h \ gnunet-service-setu_strata_estimator.c gnunet-service-setu_strata_estimator.h \ gnunet-service-setu_protocol.h diff --git a/src/setu/test_setu.conf b/src/setu/test_setu.conf new file mode 100644 index 000000000..4eaf3f0c0 --- /dev/null +++ b/src/setu/test_setu.conf @@ -0,0 +1,32 @@ +@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf + +[PATHS] +GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ + +[setu] +START_ON_DEMAND = YES +#PREFIX = valgrind --leak-check=full +#PREFIX = gdbserver :1234 +OPTIONS = -L INFO + +[transport] +PLUGINS = unix +OPTIONS = -LERROR + +[nat] +RETURN_LOCAL_ADDRESSES = YES +DISABLEV6 = YES +USE_LOCALADDR = YES + +[peerinfo] +NO_IO = YES + +[nat] +# Use addresses from the local network interfaces (inluding loopback, but also others) +USE_LOCALADDR = YES + +# Disable IPv6 support +DISABLEV6 = NO + +# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) +RETURN_LOCAL_ADDRESSES = YES diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c index 83b2af2fc..451d61d40 100644 --- a/src/util/gnunet-qr.c +++ b/src/util/gnunet-qr.c @@ -36,7 +36,7 @@ /** * Video device to capture from. Sane default for GNU/Linux systems. */ -static char *device = "/dev/video0"; +static char *device; /** * --verbose option @@ -51,7 +51,7 @@ static int silent = false; /** * Handler exit code */ -static long unsigned int exit_code = 1; +static long unsigned int exit_code = 0; /** * Helper process we started. @@ -228,6 +228,8 @@ get_symbol (zbar_processor_t *proc) } /* initialize the Processor */ + if (NULL == device) + device = GNUNET_strdup ("/dev/video0"); if (0 != (rc = zbar_processor_init (proc, device, 1))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -306,6 +308,7 @@ run_zbar () ret = GNUNET_strdup (data); /* clean up */ zbar_processor_destroy (proc); + GNUNET_free (device); return ret; } diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c index 9443c9120..de0ff1f92 100644 --- a/src/util/gnunet-uri.c +++ b/src/util/gnunet-uri.c @@ -29,7 +29,7 @@ /** * Handler exit code */ -static long unsigned int exit_code = 1; +static long unsigned int exit_code = 0; /** * Helper process we started. |