Imported Upstream version 0.9.3upstream/0.9.3

1 files changed, 72 insertions, 18 deletions

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 3c82fbf..5ea0157 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -40,7 +40,7 @@ target_triplet = @target@
 noinst_PROGRAMS = gnunet-config-diff$(EXEEXT) \
 	test_common_logging_dummy$(EXEEXT)
 bin_PROGRAMS = gnunet-service-resolver$(EXEEXT) \
-	gnunet-resolver$(EXEEXT)
+	gnunet-resolver$(EXEEXT) gnunet-rsa$(EXEEXT)
 check_PROGRAMS = test_bio$(EXEEXT) test_client$(EXEEXT) \
 	test_common_allocation$(EXEEXT) test_common_endian$(EXEEXT) \
 	test_common_logging$(EXEEXT) test_configuration$(EXEEXT) \
@@ -62,10 +62,12 @@ check_PROGRAMS = test_bio$(EXEEXT) test_client$(EXEEXT) \
 	test_peer$(EXEEXT) test_plugin$(EXEEXT) test_program$(EXEEXT) \
 	test_pseudonym$(EXEEXT) test_resolver_api$(EXEEXT) \
 	test_scheduler$(EXEEXT) test_scheduler_delay$(EXEEXT) \
-	test_server$(EXEEXT) test_server_disconnect$(EXEEXT) \
+	test_server_mst_interrupt$(EXEEXT) test_server$(EXEEXT) \
+	test_server_disconnect$(EXEEXT) \
 	test_server_with_client$(EXEEXT) $(am__EXEEXT_1) \
 	test_service$(EXEEXT) test_strings$(EXEEXT) test_time$(EXEEXT) \
-	$(am__EXEEXT_2) test_os_start_process$(EXEEXT) \
+	test_speedup$(EXEEXT) $(am__EXEEXT_2) \
+	test_os_start_process$(EXEEXT) \
 	test_common_logging_runtime_loglevels$(EXEEXT)
 subdir = src/util
 DIST_COMMON = $(dist_pkgcfg_DATA) $(srcdir)/Makefile.am \
@@ -140,7 +142,7 @@ am_libgnunetutil_la_OBJECTS = bandwidth.lo bio.lo client.lo \
 	os_installation.lo os_network.lo os_priority.lo peer.lo \
 	plugin.lo program.lo pseudonym.lo resolver_api.lo scheduler.lo \
 	server.lo server_mst.lo server_nc.lo server_tc.lo service.lo \
-	signal.lo strings.lo time.lo
+	signal.lo strings.lo time.lo speedup.lo
 libgnunetutil_la_OBJECTS = $(am_libgnunetutil_la_OBJECTS)
 libgnunetutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -162,6 +164,8 @@ am_gnunet_config_diff_OBJECTS = gnunet-config-diff.$(OBJEXT)
 gnunet_config_diff_OBJECTS = $(am_gnunet_config_diff_OBJECTS)
 am_gnunet_resolver_OBJECTS = gnunet-resolver.$(OBJEXT)
 gnunet_resolver_OBJECTS = $(am_gnunet_resolver_OBJECTS)
+am_gnunet_rsa_OBJECTS = gnunet-rsa.$(OBJEXT)
+gnunet_rsa_OBJECTS = $(am_gnunet_rsa_OBJECTS)
 am_gnunet_service_resolver_OBJECTS =  \
 	gnunet-service-resolver.$(OBJEXT)
 gnunet_service_resolver_OBJECTS =  \
@@ -345,6 +349,12 @@ am_test_server_disconnect_OBJECTS = test_server_disconnect.$(OBJEXT)
 test_server_disconnect_OBJECTS = $(am_test_server_disconnect_OBJECTS)
 test_server_disconnect_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la
+am_test_server_mst_interrupt_OBJECTS =  \
+	test_server_mst_interrupt.$(OBJEXT)
+test_server_mst_interrupt_OBJECTS =  \
+	$(am_test_server_mst_interrupt_OBJECTS)
+test_server_mst_interrupt_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la
 am_test_server_with_client_OBJECTS =  \
 	test_server_with_client.$(OBJEXT)
 test_server_with_client_OBJECTS =  \
@@ -360,6 +370,9 @@ test_server_with_client_unix_DEPENDENCIES =  \
 am_test_service_OBJECTS = test_service.$(OBJEXT)
 test_service_OBJECTS = $(am_test_service_OBJECTS)
 test_service_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
+am_test_speedup_OBJECTS = test_speedup.$(OBJEXT)
+test_speedup_OBJECTS = $(am_test_speedup_OBJECTS)
+test_speedup_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
 am_test_strings_OBJECTS = test_strings.$(OBJEXT)
 test_strings_OBJECTS = $(am_test_strings_OBJECTS)
 test_strings_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
@@ -411,9 +424,9 @@ am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(libgnunetutil_la_SOURCES) $(libgnunetutilwin_la_SOURCES) \
 	$(gnunet_config_diff_SOURCES) $(gnunet_resolver_SOURCES) \
-	$(gnunet_service_resolver_SOURCES) $(perf_crypto_hash_SOURCES) \
-	$(test_bio_SOURCES) $(test_client_SOURCES) \
-	$(test_common_allocation_SOURCES) \
+	$(gnunet_rsa_SOURCES) $(gnunet_service_resolver_SOURCES) \
+	$(perf_crypto_hash_SOURCES) $(test_bio_SOURCES) \
+	$(test_client_SOURCES) $(test_common_allocation_SOURCES) \
 	$(test_common_endian_SOURCES) $(test_common_logging_SOURCES) \
 	$(test_common_logging_dummy_SOURCES) \
 	$(test_common_logging_runtime_loglevels_SOURCES) \
@@ -439,17 +452,18 @@ SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(test_resolver_api_SOURCES) $(test_scheduler_SOURCES) \
 	$(test_scheduler_delay_SOURCES) $(test_server_SOURCES) \
 	$(test_server_disconnect_SOURCES) \
+	$(test_server_mst_interrupt_SOURCES) \
 	$(test_server_with_client_SOURCES) \
 	$(test_server_with_client_unix_SOURCES) \
-	$(test_service_SOURCES) $(test_strings_SOURCES) \
-	$(test_time_SOURCES)
+	$(test_service_SOURCES) $(test_speedup_SOURCES) \
+	$(test_strings_SOURCES) $(test_time_SOURCES)
 DIST_SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(libgnunetutil_la_SOURCES) \
 	$(am__libgnunetutilwin_la_SOURCES_DIST) \
 	$(gnunet_config_diff_SOURCES) $(gnunet_resolver_SOURCES) \
-	$(gnunet_service_resolver_SOURCES) $(perf_crypto_hash_SOURCES) \
-	$(test_bio_SOURCES) $(test_client_SOURCES) \
-	$(test_common_allocation_SOURCES) \
+	$(gnunet_rsa_SOURCES) $(gnunet_service_resolver_SOURCES) \
+	$(perf_crypto_hash_SOURCES) $(test_bio_SOURCES) \
+	$(test_client_SOURCES) $(test_common_allocation_SOURCES) \
 	$(test_common_endian_SOURCES) $(test_common_logging_SOURCES) \
 	$(test_common_logging_dummy_SOURCES) \
 	$(test_common_logging_runtime_loglevels_SOURCES) \
@@ -475,10 +489,11 @@ DIST_SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(test_resolver_api_SOURCES) $(test_scheduler_SOURCES) \
 	$(test_scheduler_delay_SOURCES) $(test_server_SOURCES) \
 	$(test_server_disconnect_SOURCES) \
+	$(test_server_mst_interrupt_SOURCES) \
 	$(test_server_with_client_SOURCES) \
 	$(test_server_with_client_unix_SOURCES) \
-	$(test_service_SOURCES) $(test_strings_SOURCES) \
-	$(test_time_SOURCES)
+	$(test_service_SOURCES) $(test_speedup_SOURCES) \
+	$(test_strings_SOURCES) $(test_time_SOURCES)
 DATA = $(dist_pkgcfg_DATA) $(pkgcfg_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -540,6 +555,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAVAPORT = @JAVAPORT@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
@@ -573,6 +589,7 @@ LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MONKEYPREFIX = @MONKEYPREFIX@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -780,17 +797,18 @@ libgnunetutil_la_SOURCES = \
   service.c \
   signal.c \
   strings.c \
-  time.c
+  time.c \
+  speedup.c
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
-  -lltdl -lz $(XLIB) 
+  -lltdl -lz -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 7:0:0
+  -version-info 8:0:0
 
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c         
@@ -812,6 +830,16 @@ gnunet_resolver_LDADD = \
 gnunet_resolver_DEPENDENCIES = \
   libgnunetutil.la
 
+gnunet_rsa_SOURCES = \
+ gnunet-rsa.c         
+
+gnunet_rsa_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_rsa_DEPENDENCIES = \
+  libgnunetutil.la
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -1054,6 +1082,12 @@ test_scheduler_delay_SOURCES = \
 test_scheduler_delay_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_server_mst_interrupt_SOURCES = \
+ test_server_mst_interrupt.c
+
+test_server_mst_interrupt_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_server_SOURCES = \
  test_server.c
 
@@ -1096,6 +1130,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_speedup_SOURCES = \
+ test_speedup.c
+
+test_speedup_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 perf_crypto_hash_SOURCES = \
  perf_crypto_hash.c
 
@@ -1107,7 +1147,8 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_pseudonym_data.conf \
   test_resolver_api_data.conf \
-  test_service_data.conf
+  test_service_data.conf \
+  test_speedup_data.conf
 
 all: all-am
 
@@ -1289,6 +1330,9 @@ gnunet-config-diff$(EXEEXT): $(gnunet_config_diff_OBJECTS) $(gnunet_config_diff_
 gnunet-resolver$(EXEEXT): $(gnunet_resolver_OBJECTS) $(gnunet_resolver_DEPENDENCIES) 
 	@rm -f gnunet-resolver$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gnunet_resolver_OBJECTS) $(gnunet_resolver_LDADD) $(LIBS)
+gnunet-rsa$(EXEEXT): $(gnunet_rsa_OBJECTS) $(gnunet_rsa_DEPENDENCIES) 
+	@rm -f gnunet-rsa$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(gnunet_rsa_OBJECTS) $(gnunet_rsa_LDADD) $(LIBS)
 gnunet-service-resolver$(EXEEXT): $(gnunet_service_resolver_OBJECTS) $(gnunet_service_resolver_DEPENDENCIES) 
 	@rm -f gnunet-service-resolver$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gnunet_service_resolver_OBJECTS) $(gnunet_service_resolver_LDADD) $(LIBS)
@@ -1418,6 +1462,9 @@ test_server$(EXEEXT): $(test_server_OBJECTS) $(test_server_DEPENDENCIES)
 test_server_disconnect$(EXEEXT): $(test_server_disconnect_OBJECTS) $(test_server_disconnect_DEPENDENCIES) 
 	@rm -f test_server_disconnect$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_server_disconnect_OBJECTS) $(test_server_disconnect_LDADD) $(LIBS)
+test_server_mst_interrupt$(EXEEXT): $(test_server_mst_interrupt_OBJECTS) $(test_server_mst_interrupt_DEPENDENCIES) 
+	@rm -f test_server_mst_interrupt$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_server_mst_interrupt_OBJECTS) $(test_server_mst_interrupt_LDADD) $(LIBS)
 test_server_with_client$(EXEEXT): $(test_server_with_client_OBJECTS) $(test_server_with_client_DEPENDENCIES) 
 	@rm -f test_server_with_client$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_server_with_client_OBJECTS) $(test_server_with_client_LDADD) $(LIBS)
@@ -1427,6 +1474,9 @@ test_server_with_client_unix$(EXEEXT): $(test_server_with_client_unix_OBJECTS) $
 test_service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES) 
 	@rm -f test_service$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_service_OBJECTS) $(test_service_LDADD) $(LIBS)
+test_speedup$(EXEEXT): $(test_speedup_OBJECTS) $(test_speedup_DEPENDENCIES) 
+	@rm -f test_speedup$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_speedup_OBJECTS) $(test_speedup_LDADD) $(LIBS)
 test_strings$(EXEEXT): $(test_strings_OBJECTS) $(test_strings_DEPENDENCIES) 
 	@rm -f test_strings$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strings_OBJECTS) $(test_strings_LDADD) $(LIBS)
@@ -1466,6 +1516,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt_helpers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-config-diff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-resolver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-rsa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-service-resolver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load.Plo@am__quote@
@@ -1486,6 +1537,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server_tc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/service.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speedup.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_client.Po@am__quote@
@@ -1529,9 +1581,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_scheduler_delay.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server_disconnect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server_mst_interrupt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server_with_client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server_with_client_unix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_service.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_speedup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@